refresh backup page with file location used for backup action, closes #4

Author: McFoggy

src/main/scala/fr/brouillard/gitbucket/h2/controller/H2BackupController.scala

@@ -19,6 +19,8 @@ class H2BackupController extends ControllerBase {
     "dest" -> trim(label("Destination", text(required)))
   )(BackupForm.apply)
 
+  private val defaultBackupFile:String = new File(GitBucketHome, "gitbucket-database-backup.zip").toString;
+
   def exportDatabase(exportFile: File): Unit = {
     val session = Database.getSession(request)
     val conn = session.conn
@@ -34,18 +36,19 @@ class H2BackupController extends ControllerBase {
   }
 
   get("/admin/h2backup") {
-    html.export(flash.get("info"));
+    html.export(flash.get("info"), flash.get("dest").orElse(Some(defaultBackupFile)));
   }
 
   get("/database/backup") {
-    val filePath:String = params.getOrElse("dest", new File(GitBucketHome, "gitbucket-database-backup.zip").toString)
+    val filePath:String = params.getOrElse("dest", defaultBackupFile)
     exportDatabase(new File(filePath))
     Ok("done")
   }
 
   post("/database/backup", backupForm) { form: BackupForm =>
     exportDatabase(new File(form.destFile))
     flash += "info" -> "H2 Database has been exported."
+    flash += "dest" -> form.destFile
     redirect("/admin/h2backup")
   }
 }

src/main/twirl/fr/brouillard/gitbucket/h2/export.scala.html

@@ -1,4 +1,4 @@
-@(info: Option[Any])(implicit context: gitbucket.core.controller.Context)
+@(info: Option[Any], dest: Option[Any])(implicit context: gitbucket.core.controller.Context)
 @import context._
 @import gitbucket.core.html.main
 @import gitbucket.core.admin.html.menu
@@ -10,14 +10,14 @@
 @information(info)
 <form action="@path/database/backup" method="POST">
     <div class="box">
-        <div class="box-header">Database export</div>
+        <div class="box-header">Database backup</div>
         <div class="box-content">
             <fieldset>
-                <label><span class="strong">Database export file:</span></label>
+                <label><span class="strong">Database backup file:</span></label>
                 <p class="muted">
-                    Allows to export the database content. The same action can be achieved via an HTTP GET call to @path/database/backup
+                    Allows to export/backup the database content. The same action can be achieved via an HTTP GET call to @path/database/backup
                 </p>
-                <input type="text" name="dest" value="@GitBucketHome/gitbucket-database-backup.zip" style="width: 400px" />
+                <input type="text" name="dest" value="@dest" style="width: 400px" />
             </fieldset>
 
         </div>