From 19eb8d29d4e34189e4e269acc4b4c5f95a83bb23 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Thu, 11 Jan 2024 16:16:25 +0800
Subject: [PATCH] * Fix create kanban region and lane error. bug #42353.

---
 module/kanban/model.php                  | 5 +++--
 module/kanban/ui/createexeclane.html.php | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/module/kanban/model.php b/module/kanban/model.php
index 430e704541..55b0d5f7a3 100755
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -814,7 +814,7 @@ class kanbanModel extends model
         $action['caret'] = false;
         $action['items'] = array();
 
-        if(common::hasPriv('kanban', 'createRegion')) $action['items'][] = array('text' => $this->lang->kanban->createRegion, 'url' => helper::createLink('kanban', 'createRegion', "kanbanID=$kanbanID"), 'data-toggle' => 'modal', 'icon' => 'plus');
+        if(common::hasPriv('kanban', 'createRegion')) $action['items'][] = array('text' => $this->lang->kanban->createRegion, 'url' => helper::createLink('kanban', 'createRegion', "kanbanID=$kanbanID&from=execution"), 'data-toggle' => 'modal', 'icon' => 'plus');
         if(common::hasPriv('kanban', 'editRegion'))   $action['items'][] = array('text' => $this->lang->kanban->editRegion,   'url' => helper::createLink('kanban', 'editRegion', "regionID=$regionID"), 'data-toggle' => 'modal', 'icon' => 'edit');
         if(common::hasPriv('kanban', 'createLane'))   $action['items'][] = array('text' => $this->lang->kanban->createLane,   'url' => helper::createLink('kanban', 'createLane', "kanbanID=$kanbanID&regionID=$regionID&from=execution"), 'data-toggle' => 'modal', 'icon' => 'plus');
 
@@ -935,12 +935,13 @@ class kanbanModel extends model
             $regionData['id']                = $regionID;
             $regionData['heading']           = $heading;
             $regionData['toggleFromHeading'] = true;
+            $regionData['items']             = array();
 
             $groups = zget($groupGroup, $regionID, array());
 
             $regionData = $this->kanbanTao->buildRDRegionData($regionData, $groups, $laneGroup, $columnGroup, $cardGroup, $searchValue);
 
-            if(!empty($regionData['items'])) $kanbanList[] = $regionData;
+            $kanbanList[] = $regionData;
         }
 
         return $kanbanList;
diff --git a/module/kanban/ui/createexeclane.html.php b/module/kanban/ui/createexeclane.html.php
index 3a765d856f..c250dca7a3 100644
--- a/module/kanban/ui/createexeclane.html.php
+++ b/module/kanban/ui/createexeclane.html.php
@@ -10,6 +10,8 @@ declare(strict_types=1);
  */
 namespace zin;
 modalHeader(set::title($lang->kanban->createLane), set::titleClass('text-lg font-bold'));
+if(empty($lanes)) unset($lang->kanbanlane->modeList['sameAsOther']);
+$mode = empty($lanes) ? 'independent' : 'sameAsOther';
 
 jsVar('regionID', $regionID);
 
@@ -50,13 +52,14 @@ formPanel
                 set::name('mode'),
                 set::items($lang->kanbanlane->modeList),
                 set::inline(true),
-                set::value('sameAsOther')
+                set::value($mode)
             )
         )
     ),
     formRow
     (
         setID('otherLaneBox'),
+        setClass(empty($lanes) ? 'hidden' : ''),
         formGroup
         (
             set::label($lang->kanbanlane->otherlane),