diff tool...

Kai Reinhard

19.55.2018 30fb30d4f7502864d61aed6e7f85c65bcbaaf913

diff tool...

 borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java

@@ -36,15 +36,15 @@
    /**
     *
     * @param repo Name of repository ({@link Repository#getName()}.
     * @param archive Id or name of archive.
     * @param archiveId Id or name of archive.
     * @param prettyPrinter If true then the json output will be in pretty format.
     * @return Repository (including list of archives) as json string.
     * @see JsonUtils#toJson(Object, boolean)
     */
    public String getArchive(@QueryParam("repo") String repoName,
                             @QueryParam("archive") String archiveIdOrName, @QueryParam("force") boolean force,
                             @QueryParam("archiveId") String archiveId, @QueryParam("force") boolean force,
                             @QueryParam("prettyPrinter") boolean prettyPrinter) {
        Archive archive = ButlerCache.getInstance().getArchive(repoName, archiveIdOrName, force);
        Archive archive = ButlerCache.getInstance().getArchive(repoName, archiveId, force);
        return JsonUtils.toJson(archive, prettyPrinter);
    }


 borgbutler-webapp/src/components/views/archives/ArchiveView.jsx

@@ -32,7 +32,7 @@
        });
        fetch(getRestServiceUrl('archives', {
            repo: this.state.repoId,
            archive: this.state.archiveId,
            archiveId: this.state.archiveId,
            force: forceReload
        }), {
            method: 'GET',

 borgbutler-webapp/src/components/views/archives/FileListFilter.jsx

@@ -15,7 +15,7 @@
                }
                let disabled = undefined;
                if (archive.id === currentArchiveId) {
                    disabled = 'true';
                    disabled = true;
                }
                return <FormOption
                    value={archive.id}
@@ -63,8 +63,8 @@
                <FormOption value={'10000'}/>
            </FormSelect>
            <FormSelect
                value={filter.diffArchive}
                name={'diffArchive'}
                value={filter.diffArchiveId}
                name={'diffArchiveId'}
                onChange={changeFilter}
                hint={'Show differences between current archive and this selected archive.'}
            >

 borgbutler-webapp/src/components/views/archives/FileListPanel.jsx

@@ -15,7 +15,7 @@
            mode: 'tree',
            currentDirectory: '',
            maxSize: '50',
            diffArchive: ''
            diffArchiveId: ''
        }
    };

@@ -52,6 +52,7 @@
        });
        fetch(getRestServiceUrl('archives/filelist', {
            archiveId: this.props.archiveId,
            diffArchiveId: this.state.filter.diffArchiveId,
            force: forceReload,
            searchString: this.state.filter.search,
            mode: this.state.filter.mode,