From 3f8e8f856143fb19536e7843bb277c24b13c0958 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Sat, 29 Dec 2018 10:35:44 +0100
Subject: [PATCH] fix saving branch prefix, fixes #260

---
 .../javascripts/dialogs/branch_prefix.js      |  3 ++
 src/views/dialogs/branch_prefix.ejs           | 40 ++++++++++---------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/public/javascripts/dialogs/branch_prefix.js b/src/public/javascripts/dialogs/branch_prefix.js
index 47238149f..f2a41d602 100644
--- a/src/public/javascripts/dialogs/branch_prefix.js
+++ b/src/public/javascripts/dialogs/branch_prefix.js
@@ -2,6 +2,7 @@ import treeService from '../services/tree.js';
 import server from '../services/server.js';
 import treeCache from "../services/tree_cache.js";
 import treeUtils from "../services/tree_utils.js";
+import infoService from "../services/info.js";
 
 const $dialog = $("#branch-prefix-dialog");
 const $form = $("#branch-prefix-form");
@@ -35,6 +36,8 @@ async function savePrefix() {
     await treeService.setPrefix(branchId, prefix);
 
     $dialog.modal('hide');
+
+    infoService.showMessage("Branch prefix has been saved.");
 }
 
 $form.submit(() => {
diff --git a/src/views/dialogs/branch_prefix.ejs b/src/views/dialogs/branch_prefix.ejs
index 2dd433fc1..4fd934b32 100644
--- a/src/views/dialogs/branch_prefix.ejs
+++ b/src/views/dialogs/branch_prefix.ejs
@@ -1,31 +1,33 @@
 <div id="branch-prefix-dialog" class="modal fade mx-auto" tabindex="-1" role="dialog">
     <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title mr-auto">Edit branch prefix</h5>
+        <form id="branch-prefix-form">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title mr-auto">Edit branch prefix</h5>
 
-                <button class="help-button" type="button" data-help-page="Tree-concepts#prefix" title="Help on Tree prefix">?</button>
+                    <button class="help-button" type="button" data-help-page="Tree-concepts#prefix" title="Help on Tree prefix">?</button>
 
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0;">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="form-group">
-                    <label for="branch-prefix-input">Prefix: </label> &nbsp;
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close" style="margin-left: 0;">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <div class="form-group">
+                        <label for="branch-prefix-input">Prefix: </label> &nbsp;
 
-                    <div class="input-group">
-                        <input id="branch-prefix-input" class="form-control">
+                        <div class="input-group">
+                            <input id="branch-prefix-input" class="form-control">
 
-                        <div class="input-group-append">
-                            <div id="branch-prefix-note-title" class="input-group-text"></div>
+                            <div class="input-group-append">
+                                <div id="branch-prefix-note-title" class="input-group-text"></div>
+                            </div>
                         </div>
                     </div>
                 </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary btn-sm">Save</button>
+                </div>
             </div>
-            <div class="modal-footer">
-                <button class="btn btn-primary btn-sm">Save</button>
-            </div>
-        </div>
+        </form>
     </div>
 </div>