From 160b2b47ad5bcb58267653ff63ed1826525b40a7 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 15 Dec 2018 07:31:40 +0000
Subject: [PATCH] ...
---
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java | 7 +++++++
borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/BorgArchive.java | 3 +++
borgbutler-webapp/src/components/views/repos/RepoArchiveListView.jsx | 19 ++++++++++++++++++-
3 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
index 9061fed..7a89cff 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgCommands.java
@@ -78,6 +78,13 @@
.setLastCacheRefresh(DateUtils.format(LocalDateTime.now()));
Repository repository = ObjectUtils.clone(masterRepository)
.setArchives(repoList.getArchives());
+ if (repository.getArchives() != null) {
+ for (BorgArchive archive : repository.getArchives()) {
+ // Reformat Borg date strings.
+ archive.setStart(DateUtils.format(archive.getStart()));
+ archive.setTime(DateUtils.format(archive.getTime()));
+ }
+ }
return repository;
}
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/BorgArchive.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/BorgArchive.java
index 5d28333..3af01f3 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/BorgArchive.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/BorgArchive.java
@@ -2,6 +2,7 @@
import de.micromata.borgbutler.json.JsonUtils;
import lombok.Getter;
+import lombok.Setter;
import java.io.Serializable;
@@ -19,8 +20,10 @@
@Getter
private String name;
@Getter
+ @Setter
private String start;
@Getter
+ @Setter
private String time;
public String toString() {
diff --git a/borgbutler-webapp/src/components/views/repos/RepoArchiveListView.jsx b/borgbutler-webapp/src/components/views/repos/RepoArchiveListView.jsx
index 6b321fd..f8fc0c5 100644
--- a/borgbutler-webapp/src/components/views/repos/RepoArchiveListView.jsx
+++ b/borgbutler-webapp/src/components/views/repos/RepoArchiveListView.jsx
@@ -93,7 +93,24 @@
</Nav>
<TabContent activeTab={this.state.activeTab}>
<TabPane tabId={'1'}>
- Hurzel
+ <Table>
+ <tbody>
+ <tr>
+ <th>Archive</th>
+ <th>Time</th>
+ <th>Id</th>
+ </tr>
+ {repo.archives.map((archive) => {
+ // Return the element. Also pass key
+ return (
+ <tr key={archive.id}>
+ <td>{archive.archive}</td>
+ <td>{archive.time}</td>
+ <td>{archive.id}</td>
+ </tr>);
+ })}
+ </tbody>
+ </Table>
</TabPane>
<TabPane tabId={'2'}>
<Table hover>
--
Gitblit v1.10.0