Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix create kanban region and lane error. bug #42353.

Browse Source
This commit is contained in:
wangyuting
2024-01-11 16:16:25 +08:00
parent 390afe0458
commit 19eb8d29d4
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/model.php
+3 -2
View File
@@ -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;
module/kanban/ui/createexeclane.html.php
+4 -1
View File
@@ -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),