From 2145a4ba1fb51157561cd35830e08ae7e45f1b3f Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Mon, 17 Dec 2018 23:43:42 +0000
Subject: [PATCH] tree view...
---
borgbutler-webapp/src/components/views/archives/FileListPanel.jsx | 4 ++++
borgbutler-webapp/src/components/views/archives/FileListFilter.jsx | 8 ++++++++
borgbutler-core/src/main/java/de/micromata/borgbutler/data/FileSystemFilter.java | 6 +++---
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/data/FileSystemFilter.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/data/FileSystemFilter.java
index 9100597..02febc5 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/data/FileSystemFilter.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/data/FileSystemFilter.java
@@ -101,9 +101,6 @@
* @return
*/
private boolean matchesDirectoryView(BorgFilesystemItem item) {
- if (mode != Mode.TREE) {
- return true;
- }
String path = item.getPath();
if (StringUtils.isEmpty(currentDirectory)) {
// root dir
@@ -170,6 +167,9 @@
}
private void processFinishedFlag() {
+ if (mode == Mode.TREE) {
+ return;
+ }
if (maxResultSize > 0 && ++counter >= maxResultSize) {
this.finished = true;
}
diff --git a/borgbutler-webapp/src/components/views/archives/FileListFilter.jsx b/borgbutler-webapp/src/components/views/archives/FileListFilter.jsx
index c87a7b8..4c4cdf4 100644
--- a/borgbutler-webapp/src/components/views/archives/FileListFilter.jsx
+++ b/borgbutler-webapp/src/components/views/archives/FileListFilter.jsx
@@ -25,6 +25,14 @@
/>
<FormSelect
+ value={filter.mode}
+ name={'mode'}
+ onChange={changeFilter}
+ >
+ <FormOption value={'flat'} />
+ <FormOption value={'tree'} />
+ </FormSelect>
+ <FormSelect
value={filter.maxSize}
name={'maxSize'}
onChange={changeFilter}
diff --git a/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx b/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
index 39c7701..8e01937 100644
--- a/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
+++ b/borgbutler-webapp/src/components/views/archives/FileListPanel.jsx
@@ -12,6 +12,8 @@
fileList: undefined,
filter: {
search: '',
+ mode: undefined,
+ currentDirectory: '',
maxSize: '50'
}
};
@@ -39,6 +41,8 @@
archiveId: this.props.archiveId,
force: forceReload,
searchString: this.state.filter.search,
+ mode: this.state.filter.mode,
+ currentDirectory: this.state.filter.currentDirectory,
maxResultSize: this.state.filter.maxSize
}), {
method: 'GET',
--
Gitblit v1.10.0