Browse Source

Add support for showing latest backup on FE

pull/20/head
Kristijan Mitrovic 4 years ago
parent
commit
a92402f467
3 changed files with 7 additions and 1 deletions
  1. +3
    -0
      bubble-server/src/main/java/bubble/model/cloud/BubbleBackup.java
  2. +3
    -0
      bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
  3. +1
    -1
      bubble-web

+ 3
- 0
bubble-server/src/main/java/bubble/model/cloud/BubbleBackup.java View File

@@ -75,4 +75,7 @@ public class BubbleBackup extends IdentifiableBase implements HasAccount {
public boolean hasError () { return !empty(error); }

public boolean canDelete() { return status.isDeletable() || getCtimeAge() > BR_STATE_LOCK_TIMEOUT; }

public long getCreationTime() { return getCtime(); }
public void setCreationTime(long c) { /* noop */ }
}

+ 3
- 0
bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties View File

@@ -241,6 +241,9 @@ restore_not_possible_nodes_exist_html=Cannot restore bubbles with existing nodes
title_network_danger_zone=Danger Zone
link_network_action_stop=Stop
link_network_action_stop_description=Stop this Bubble. If you have downloaded your restore key, you can later restore it.
label_latest_backup=Latest Backup:
label_no_latest_backup=No backups available
link_backup_network=Queue new backup
link_network_action_delete=Delete
link_network_action_delete_description=Delete this Bubble and all backups. You will not be able to restore this Bubble. This action cannot be undone.



+ 1
- 1
bubble-web

@@ -1 +1 @@
Subproject commit 9ebb15fdc7a4188a1e04af0a4e76957d5525d461
Subproject commit 5dfe5c5deebbc955e19830b1717da0fb2b5f3447

Loading…
Cancel
Save