From bf3a837f8a96efc8f6163cf3870c1dd00772eace Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sun, 16 Dec 2018 17:42:06 +0000
Subject: [PATCH] Load button and empty search results fixed.
---
borgbutler-webapp/src/components/views/archives/FileListPanel.jsx | 12 ++++++------
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java
index a444b3b..6cfe285 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/ArchivesRest.java
@@ -62,7 +62,7 @@
List<BorgFilesystemItem> items = ButlerCache.getInstance().getArchiveContent(archiveId, force,
filter);
if (items == null) {
- return "[{patch: 'notLoaded'}]";
+ return "[{\"mode\": \"notLoaded\"}]";
}
return JsonUtils.toJson(items, prettyPrinter);
}
diff --git a/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx b/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
index a3d8d18..c8db818 100644
--- a/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
+++ b/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
@@ -71,7 +71,12 @@
}}
/>;
} else if (this.state.fileList) {
- if (this.state.fileList.length > 0) {
+ if (this.state.fileList.length === 1 && this.state.fileList[0].mode === 'notLoaded') {
+ content = <React.Fragment>
+ <Button outline color="primary" onClick={() => this.fetchArchiveFileList(true)}>Load file list from
+ borg backup server</Button>
+ </React.Fragment>;
+ } else {
content = <React.Fragment>
<FileListFilter
filter={this.state.filter}
@@ -84,11 +89,6 @@
<FileListTable
entries={this.state.fileList}/>
</React.Fragment>;
- } else {
- content = <React.Fragment>
- <Button outline color="primary" onClick={() => this.fetchArchiveFileList(true)}>Load file list from
- borg backup server</Button>
- </React.Fragment>;
}
}
return <React.Fragment>
--
Gitblit v1.10.0