From 897f930f481268049f49ef0e7fc896f1fc12e2a2 Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 23 Dec 2021 14:01:25 +0800
Subject: [PATCH] * Adjust the merge branch page style.

---
 module/branch/js/manage.js         | 15 ++++++++++++---
 module/branch/view/manage.html.php |  1 +
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/module/branch/js/manage.js b/module/branch/js/manage.js
index f52b3a8b75..49f87ac8e8 100644
--- a/module/branch/js/manage.js
+++ b/module/branch/js/manage.js
@@ -65,8 +65,8 @@ $(function()
         {
             $('#targetBranch').attr('disabled', true).trigger('chosen:updated');
 
-            var newBranchName = '<tr><th>' + branchLang.name + "</th><td class='required'><input type='text' name='name' id='name' class='form-control' /></td></tr>";
-            var newBranchDesc = '<tr><th>' + branchLang.desc + "</th><td><input type='text' name='desc' id='desc' class='form-control' /></td></tr>";
+            var newBranchName = '<tr><th>' + branchLang.name + "</th><td class='required' colspan='7'><input type='text' name='name' id='name' class='form-control' /></td></tr>";
+            var newBranchDesc = '<tr><th>' + branchLang.desc + "</th><td colspan='7'><input type='text' name='desc' id='desc' class='form-control' /></td></tr>";
             $(this).closest('tr').after(newBranchName + newBranchDesc);
         }
         else
@@ -96,6 +96,8 @@ $(function()
             $('#targetBranch').replaceWith(data);
             $('#targetBranch_chosen').remove();
             $('#targetBranch').chosen();
+
+            if($('#createBranch').prop('checked')) $('#targetBranch').attr('disabled', true).trigger('chosen:updated')
         })
     })
 
@@ -123,6 +125,13 @@ $(function()
             return false;
         }
 
+        var branchNames = Object.values(branchPairs);
+        if(isChecked && branchNames.includes($('#name').val()) !== -1)
+        {
+            alert(branchLang.existName);
+            return false;
+        }
+
         if(confirm(confirmMergeMessage))
         {
             var postData = {'name' : $('#name').val(), 'desc' : $('#desc').val(), 'createBranch' : isChecked, 'mergedBranchIDList' : mergedBranchIDList, 'targetBranch' : $('#targetBranch').val()};
@@ -136,7 +145,7 @@ $(function()
                 {
                     if(data.result == 'fail')
                     {
-                        alert(data.message)
+                        alert(data.message.name)
                         return false;
                     }
                     else
diff --git a/module/branch/view/manage.html.php b/module/branch/view/manage.html.php
index bb39ad9aab..7c7af2328d 100644
--- a/module/branch/view/manage.html.php
+++ b/module/branch/view/manage.html.php
@@ -15,6 +15,7 @@
 <?php js::set('orderBy', $orderBy)?>
 <?php js::set('branchLang', $lang->branch);?>
 <?php js::set('productID', $productID);?>
+<?php js::set('branchPairs', $branchPairs);?>
 <?php $canCreate      = common::hasPriv('branch', 'create');?>
 <?php $canOrder       = common::hasPriv('branch', 'sort');?>
 <?php $canBatchEdit   = common::hasPriv('branch', 'batchEdit');?>