From 8318d1fa699627a39864674bddcce14abe0bb578 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 21 Dec 2021 09:02:24 +0800
Subject: [PATCH] * Fix bug for task#46150,#46158.

---
 module/kanban/lang/en.php              | 2 +-
 module/kanban/lang/zh-cn.php           | 2 +-
 module/kanban/view/editregion.html.php | 4 ++--
 module/kanban/view/view.html.php       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 0f7dc1a4b9..b6614bc997 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -124,7 +124,7 @@ $lang->kanban->columnColor        = 'Column Color';
 $lang->kanban->noColumnUniqueName = 'The Kanban column name already exists.';
 $lang->kanban->moveUp             = 'Swimlane Up';
 $lang->kanban->moveDown           = 'Swimlane Down';
-$lang->kanban->laneMove           = 'Swimlane Sorting';
+$lang->kanban->laneMove           = 'Swimlane Move';
 $lang->kanban->laneGroup          = 'Lane Group';
 $lang->kanban->cardsSort          = 'Cards Sortting';
 $lang->kanban->more               = 'More';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index b7ffc94854..1c472a58df 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -124,7 +124,7 @@ $lang->kanban->columnColor        = '看板列颜色';
 $lang->kanban->noColumnUniqueName = '看板列名称已存在';
 $lang->kanban->moveUp             = '泳道上移';
 $lang->kanban->moveDown           = '泳道下移';
-$lang->kanban->laneMove           = '泳道排序';
+$lang->kanban->laneMove           = '泳道移动';
 $lang->kanban->laneGroup          = '泳道分组';
 $lang->kanban->cardsSort          = '卡片排序';
 $lang->kanban->more               = '更多';
diff --git a/module/kanban/view/editregion.html.php b/module/kanban/view/editregion.html.php
index 2bcd938d73..a9519ab493 100644
--- a/module/kanban/view/editregion.html.php
+++ b/module/kanban/view/editregion.html.php
@@ -22,12 +22,12 @@
       <table align='center' class='table table-form'>
         <tr>
           <th><?php echo $lang->kanbanregion->name;?></th>
-          <td colspan='2'>
+          <td colspan='4'>
             <?php echo html::input('name', $region->name, "class='form-control'");?>
           </td>
         </tr>
         <tr>
-          <td colspan='4' class='text-center form-actions'>
+          <td colspan='5' class='text-center form-actions'>
             <?php echo html::submitButton();?>
             <?php echo html::commonButton($lang->cancel, "data-dismiss='modal'", 'btn btn-wide');?>
           </td>
diff --git a/module/kanban/view/view.html.php b/module/kanban/view/view.html.php
index d89758ed7c..e3d3d71fde 100644
--- a/module/kanban/view/view.html.php
+++ b/module/kanban/view/view.html.php
@@ -51,7 +51,7 @@ $canCreateLane   = commonModel::hasPriv('kanban', 'createLane');
       <?php if($canEditRegion || $canCreateLane || $canDeleteRegion):?>
       <button class="btn btn-link action" type="button" data-toggle="dropdown"><i class="icon icon-ellipsis-v"></i></button>
       <ul class="dropdown-menu pull-right">
-        <?php if($canEditRegion) echo '<li>' . html::a(inlink('editRegion', "regionID={$region->id}", '', 1), '<i class="icon icon-edit"></i>' . $this->lang->kanban->editRegion, '', 'class="iframe"') . '</li>';?>
+        <?php if($canEditRegion) echo '<li>' . html::a(inlink('editRegion', "regionID={$region->id}", '', 1), '<i class="icon icon-edit"></i>' . $this->lang->kanban->editRegion, '', 'class="iframe" data-toggle="modal" data-width="600px"') . '</li>';?>
         <?php if($canCreateLane) echo '<li>' . html::a(inlink('createLane', "kanbanID={$kanban->id}&regionID={$region->id}", '', 1), '<i class="icon icon-plus"></i>' . $this->lang->kanban->createLane, '', "class='iframe'") . '</li>';?>
         <?php if($canDeleteRegion and count($regions) > 1) echo '<li>' . html::a(inlink('deleteRegion', "regionID={$region->id}"), '<i class="icon icon-trash"></i>' . $this->lang->kanban->deleteRegion, "hiddenwin") . '</li>';?>
       </ul>