The Unified and Autonomous Development Platform
Add git repository backup notice on database backup page.
Robin Shen1fc5fde92808
diff --git a/core/src/main/java/com/gitplex/server/manager/StorageManager.java b/core/src/main/java/com/gitplex/server/manager/StorageManager.javaindex 7d5819cf9f..a9f0d081b0 100644--- a/core/src/main/java/com/gitplex/server/manager/StorageManager.java+++ b/core/src/main/java/com/gitplex/server/manager/StorageManager.java@@ -4,6 +4,8 @@ import java.io.File;public interface StorageManager {+ File getStorageDir();+/*** Get directory to store git repository of specified project*diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.javaindex 171202ccdb..e1c021cfdb 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultStorageManager.java@@ -37,7 +37,8 @@ public class DefaultStorageManager implements StorageManager {this.configManager = configManager;}- private File getStorageDir() {+ @Override+ public File getStorageDir() {File storageDir = new File(configManager.getSystemSetting().getStoragePath());FileUtils.createDir(storageDir);return storageDir;diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.html b/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.htmlindex 96ae37a0d8..91545994f5 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.html@@ -1,5 +1,9 @@<wicket:extend><div class="database-backup">+ <div class="alert alert-info">+ GitPlex stores project meta data into database, and <b>its backup/restore will not affect git repositories</b>.+ To backup git repositories, you will need to use some file system backup tool to backup directory+ "<span wicket:id="storageDir"></span>"</div><form wicket:id="backupSetting" class="leave-confirm"><div wicket:id="editor"></div><div class="actions">diff --git a/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.java b/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.javaindex 2a895b334a..57b2ae6f20 100644--- a/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/admin/databasebackup/DatabaseBackupPage.java@@ -4,12 +4,14 @@ import java.io.File;import java.io.IOException;import org.apache.tika.mime.MimeTypes;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.ResourceLink;import org.apache.wicket.request.resource.AbstractResource;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.ConfigManager;+import com.gitplex.server.manager.StorageManager;import com.gitplex.server.persistence.PersistManager;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.page.admin.AdministrationPage;@@ -23,6 +25,8 @@ public class DatabaseBackupPage extends AdministrationPage {protected void onInitialize() {super.onInitialize();+ add(new Label("storageDir", GitPlex.getInstance(StorageManager.class).getStorageDir()));+BackupSettingHolder backupSettingHolder = new BackupSettingHolder();backupSettingHolder.setBackupSetting(GitPlex.getInstance(ConfigManager.class).getBackupSetting());Form<?> form = new Form<Void>("backupSetting") {