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

* Fix bug #46745.

Browse Source
This commit is contained in:
sunguangming
2024-03-12 08:55:15 +08:00
parent 0250d8753d
commit 0d38cdab59
3 changed files with 353 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/execution/ext/model/lite.php
+9 -81
View File
@@ -15,61 +15,23 @@ public function setMenu(int $executionID, int $buildID = 0, string $extra = '')
$currentKanban = zget($kanbanList, $execution->id, '');
if(empty($currentKanban)) $this->accessDenied();
$lowerModule = strtolower($this->app->rawModule);
$lowerMethod = strtolower($this->app->rawMethod);
$subMenu = $this->lang->execution->menu;
$modulePageNav = "";
$modulePageNav .= "<div class='btn-group angle-btn active'><div class='btn-group'>";
$modulePageNav .= "<button data-toggle='dropdown' type='button' class='btn' style='border-radius: 4px;'>{$currentKanban->name} <span class='caret'></span></button>";
$modulePageNav .= "<ul class='dropdown-menu'>";
foreach($kanbanList as $kanbanID => $kanban)
foreach($subMenu as $key => $value)
{
if($this->session->kanbanview && strpos('|kanban|task|calendar|gantt|tree|grouptask|', "|{$this->session->kanbanview}|") !== false)
if(common::hasPriv('execution', $key))
{
$method = $this->session->kanbanview;
}
elseif($this->cookie->kanbanview && strpos('|kanban|task|calendar|gantt|tree|grouptask|', "|{$this->cookie->kanbanview}|") !== false)
{
$method = $this->cookie->kanbanview;
$tmpValue = explode('|', $value['link']);
$subMenu->{$key}['name'] = $tmpValue[0];
$subMenu->{$key}['module'] = $tmpValue[1];
$subMenu->{$key}['method'] = $tmpValue[2];
$subMenu->{$key}['vars'] = $tmpValue[3];
}
else
{
$method = 'kanban';
}
$module = 'execution';
if($lowerModule == 'task' and $lowerMethod == 'create')
{
$module = 'task';
$method = 'create';
}
$modulePageNav .= '<li>' . html::a(helper::createLink($module, $method, "execution=$kanban->id"), $kanban->name) . '</li>';
}
$modulePageNav .= "</ul></div></div>";
if($lowerModule == 'execution' and strpos('|kanban|task|calendar|gantt|tree|grouptask|', "|{$lowerMethod}|") !== false)
{
$this->session->set('kanbanview', $lowerMethod);
setcookie('kanbanview', $lowerMethod, $this->config->cookieLife, $this->config->webRoot, '', false, true);
}
if(strpos('|task|calendar|gantt|tree|grouptask|', "|{$lowerMethod}|") !== false) $this->lang->TRActions = $this->getTRActions($lowerMethod);
if(strpos('|relation|maintainrelation|', "|{$lowerMethod}|") !== false) $this->lang->TRActions = $this->getTRActions('gantt');
if($lowerModule == 'task' or ($lowerModule == 'execution' and strpos('|kanban|task|calendar|gantt|tree|grouptask|', "|{$lowerMethod}|") === false))
{
if($this->session->kanbanview)
{
$this->lang->TRActions = $this->getTRActions($this->session->kanbanview);
}
elseif($this->cookie->kanbanview)
{
$this->lang->TRActions = $this->getTRActions($this->cookie->kanbanview);
unset($subMenu->$key);
}
}
$this->lang->modulePageNav = $modulePageNav;
}
public function getTree(int $executionID): array
@@ -116,37 +78,3 @@ public function getTree(int $executionID): array
return array_values($newTrees);
}
public function getTRActions(string $currentMethod): string
{
$subMenu = $this->lang->execution->menu;
foreach($subMenu as $key => $value)
{
if(common::hasPriv('execution', $key))
{
$tmpValue = explode('|', $value['link']);
$subMenu->{$key}['name'] = $tmpValue[0];
$subMenu->{$key}['module'] = $tmpValue[1];
$subMenu->{$key}['method'] = $tmpValue[2];
$subMenu->{$key}['vars'] = $tmpValue[3];
}
else
{
unset($subMenu->$key);
}
}
$TRActions = '';
$TRActions .= "<div class='btn-group dropdown'>";
$TRActions .= html::a("javascript:;", "<i class='icon icon-" . $this->lang->execution->icons[$currentMethod]."'> </i>" . $subMenu->{$currentMethod}['name'] . " <span class='caret'></span>", '', "class='btn btn-link' data-toggle='dropdown'");
$TRActions .= "<ul class='dropdown-menu pull-right'>";
foreach($subMenu as $subKey => $subName)
{
$active = $this->session->kanbanview == $subKey ? "class='active'" : '';
$TRActions .= "<li $active>" . html::a(helper::createLink('execution', $subName['method'], $subName['vars']), "<i class='icon icon-" . $this->lang->execution->icons[$subName['method']] . "'></i> " . $subName['name']) . '</li>';
}
$TRActions .= "</ul></div>";
return $TRActions;
}
extension/lite/execution/ext/ui/kanban.html.php
+343
View File
@@ -0,0 +1,343 @@
<?php
declare(strict_types=1);
/**
* The kanban view file of execution module of ZenTaoPMS.
* @copyright Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
* @license ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
* @author Sun Guangming <sunguangming@easycorp.ltd>
* @package kanban
* @link https://www.zentao.net
*/
namespace zin;
include 'header.html.php';
$laneCount = 0;
foreach($kanbanList as $current => $region)
{
foreach($region['items'] as $index => $group)
{
$groupID = $group['id'];
$group['getLane'] = jsRaw('window.getLane');
$group['getCol'] = jsRaw('window.getCol');
$group['getItem'] = jsRaw('window.getItem');
$group['minColWidth'] = $execution->fluidBoard == '0' ? $execution->colWidth : $execution->minColWidth;
$group['maxColWidth'] = $execution->fluidBoard == '0' ? $execution->colWidth : $execution->maxColWidth;
$group['colProps'] = array('actions' => jsRaw('window.getColActions'));
$group['laneProps'] = array('actions' => jsRaw('window.getLaneActions'));
$group['itemProps'] = array('actions' => jsRaw('window.getItemActions'));
if($execution->displayCards > 0)
{
$group['minLaneHeight'] = $execution->displayCards * 70;
$group['maxLaneHeight'] = $execution->displayCards * 70;
}
if(common::canModify('execution', $execution))
{
$group['canDrop'] = jsRaw('window.canDrop');
$group['onDrop'] = jsRaw('window.onDrop');
}
$kanbanList[$current]['items'][$index] = $group;
}
$laneCount += isset($region['laneCount']) ? $region['laneCount'] : 0;
}
$operationMenu = array();
if(common::hasPriv('kanban', 'createRegion'))
{
$operationMenu[] = array('text' => $lang->kanban->createRegion, 'url' => helper::createLink('kanban', 'createRegion', "kanbanID=$execution->id&from=execution"), 'data-toggle' => 'modal', 'icon' => 'plus');
$operationMenu[] = array('type' => 'divider');
}
if($this->execution->isClickable($execution, 'edit')) $operationMenu[] = array('text' => $lang->execution->edit, 'url' => inlink('edit', "id=$execution->id"), 'data-toggle' => 'modal', 'data-size' => 'lg', 'icon' => 'edit');
if($this->execution->isClickable($execution, 'start')) $operationMenu[] = array('text' => $lang->execution->start, 'url' => inlink('start', "id=$execution->id"), 'data-toggle' => 'modal', 'icon' => 'start');
if($this->execution->isClickable($execution, 'putoff')) $operationMenu[] = array('text' => $lang->execution->putoff, 'url' => inlink('putoff', "id=$execution->id"), 'data-toggle' => 'modal', 'icon' => 'calendar');
if($this->execution->isClickable($execution, 'suspend')) $operationMenu[] = array('text' => $lang->execution->suspend, 'url' => inlink('suspend', "id=$execution->id"), 'data-toggle' => 'modal', 'icon'=> 'pause');
if($this->execution->isClickable($execution, 'close')) $operationMenu[] = array('text' => $lang->execution->close, 'url' => inlink('close', "id=$execution->id"), 'data-toggle' => 'modal', 'icon' => 'off');
if($this->execution->isClickable($execution, 'activate')) $operationMenu[] = array('text' => $lang->execution->activate, 'url' => inlink('activate', "id=$execution->id"), 'data-toggle' => 'modal', 'icon' => 'off');
if($this->execution->isClickable($execution, 'delete')) $operationMenu[] = array('text' => $lang->delete, 'url' => inlink('delete', "id=$execution->id&confirm=no"), 'innerClass' => 'ajax-submit', 'icon' => 'trash');
$groupMenu = array();
foreach($this->lang->execution->kanbanGroup as $groupKey => $groupName)
{
$groupMenu[] = array('text' => $groupName, 'url' => inlink('kanban', "execution=$execution->id&browseType=task&orderBy=$orderBy&groupBy=$groupKey"));
}
$canCreateTask = common::hasPriv('task', 'create') && common::canModify('execution', $execution);
$canBatchCreateTask = common::hasPriv('task', 'batchCreate') && common::canModify('execution', $execution);
$canImportTask = common::hasPriv('execution', 'importTask') && $execution->multiple && common::canModify('execution', $execution) && $this->config->vision != 'lite';
$canCreateBug = $features['qa'] && common::hasPriv('bug', 'create') && common::canModify('execution', $execution) && $productID && $this->config->vision != 'lite';
$canBatchCreateBug = $features['qa'] && common::hasPriv('bug', 'batchCreate') && $execution->multiple && common::canModify('execution', $execution) && $productID && $this->config->vision != 'lite';
$canImportBug = $features['qa'] && common::hasPriv('execution', 'importBug') && $execution->multiple && common::canModify('execution', $execution) && $productID && $this->config->vision != 'lite';
$hasBugButton = $features['qa'] && ($canCreateBug || $canBatchCreateBug);
$canCreateStory = $features['story'] && common::hasPriv('story', 'create') && common::canModify('execution', $execution) && $productID && $this->config->vision != 'lite';
$canBatchCreateStory = $features['story'] && common::hasPriv('story', 'batchCreate') && common::canModify('execution', $execution) && $productID && $this->config->vision != 'lite';
$canLinkStory = $features['story'] && common::hasPriv('execution', 'linkStory') && !empty($execution->hasProduct) && common::canModify('execution', $execution) && $productID && $this->config->vision != 'lite';
$canLinkStoryByPlan = $features['story'] && common::hasPriv('execution', 'importplanstories') && !empty($project->hasProduct) && common::canModify('execution', $execution) && $productID && $this->config->vision != 'lite';
$hasStoryButton = $features['story'] && ($canCreateStory || $canBatchCreateStory || $canLinkStory || $canLinkStoryByPlan);
$hasTaskButton = $canCreateTask || $canBatchCreateTask || $canImportBug;
$createMenu = array();
$modal = $productID ? 'modal' : false;
if($canCreateStory) $createMenu[] = array('text' => $lang->story->create, 'url' => $productID ? helper::createLink('story', 'create', "productID=$productID&branch=0&moduleID=0&story=0&execution=$execution->id") : 'javascript:;', 'data-toggle' => $modal, 'data-size' => 'lg', 'data-on' => 'click', 'data-call' => 'checkProducts');
if($canBatchCreateStory) $createMenu[] = array('text' => $lang->story->batchCreate, 'url' => $productID ? (count($productNames) > 1 ? '#batchCreateStory' : helper::createLink('story', 'batchCreate', "productID=$productID&branch=$branchID&moduleID=0&story=0&execution=$execution->id")) : 'javascript:;', 'data-toggle' => $modal, 'data-size' => 'lg', 'data-on' => 'click', 'data-call' => 'checkProducts');
if($canLinkStory) $createMenu[] = array('text' => $lang->execution->linkStory, 'url' => $productID ? helper::createLink('execution', 'linkStory', "execution=$execution->id") : 'javascript:;', 'data-toggle' => $modal, 'data-size' => 'lg', 'data-on' => 'click', 'data-call' => 'checkProducts');
if($canLinkStoryByPlan) $createMenu[] = array('text' => $lang->execution->linkStoryByPlan, 'url' => $productID ? "#linkStoryByPlan" : 'javascript:;', 'data-toggle' => $modal, 'data-size' => 'sm', 'data-on' => 'click', 'data-call' => 'checkProducts');
if($hasStoryButton && $hasTaskButton) $createMenu[] = array('type' => 'divider');
if($canCreateBug) $createMenu[] = array('text' => $lang->bug->create, 'url' => helper::createLink('bug', 'create', "productID=$productID&branch=0&extra=executionID=$execution->id"), 'data-toggle' => 'modal', 'data-size' => 'lg');
if($canBatchCreateBug)
{
if(count($productNames) > 1)
{
$createMenu[] = array('text' => $lang->bug->batchCreate, 'url' => '#batchCreateBug', 'data-toggle' => 'modal');
}
else
{
$createMenu[] = array('text' => $lang->bug->batchCreate, 'url' => helper::createLink('bug', 'batchCreate', "productID=$productID&branch=$branchID&extra=&executionID=$execution->id"), 'data-toggle' => 'modal', 'data-size' => 'lg');
}
}
if(($hasStoryButton or $hasBugButton) and $hasTaskButton) $createMenu[] = array('type' => 'divider');
if($canCreateTask) $createMenu[] = array('text' => $lang->task->create, 'url' => helper::createLink('task', 'create', "execution=$execution->id"), 'data-toggle' => 'modal', 'data-size' => 'lg');
if($canImportBug) $createMenu[] = array('text' => $lang->execution->importBug, 'url' => helper::createLink('execution', 'importBug', "execution=$execution->id"), 'data-toggle' => 'modal');
if($canImportTask) $createMenu[] = array('text' => $lang->execution->importTask, 'url' => helper::createLink('execution', 'importTask', "execution=$execution->id"), 'data-toggle' => 'modal');
if($canBatchCreateTask) $createMenu[] = array('text' => $lang->execution->batchCreateTask, 'url' => helper::createLink('task', 'batchCreate', "execution=$execution->id"), 'data-toggle' => 'modal', 'data-size' => 'lg');
jsVar('laneCount', $laneCount);
jsVar('kanbanLang', $lang->kanban);
jsVar('storyLang', $lang->story);
jsVar('executionLang', $lang->execution);
jsVar('laneLang', $lang->kanbanlane);
jsVar('cardLang', $lang->kanbancard);
jsVar('bugLang', $lang->bug);
jsVar('taskLang', $lang->task);
jsVar('executionID', $execution->id);
jsVar('productID', $productID);
jsVar('productCount', count($productNames));
jsVar('vision', $config->vision);
jsVar('groupBy', $groupBy);
jsVar('browseType', $browseType);
jsVar('orderBy', $orderBy);
jsVar('minColWidth', $execution->fluidBoard == '0' ? $execution->colWidth : $execution->minColWidth);
jsVar('maxColWidth', $execution->fluidBoard == '0' ? $execution->colWidth : $execution->maxColWidth);
jsVar('priv',
array(
'canCreateTask' => $canCreateTask,
'canBatchCreateTask' => $canBatchCreateTask,
'canImportBug' => $canImportBug,
'canCreateBug' => $canCreateBug,
'canBatchCreateBug' => $canBatchCreateBug,
'canCreateStory' => $canCreateStory,
'canBatchCreateStory' => $canBatchCreateStory,
'canLinkStory' => $canLinkStory,
'canLinkStoryByPlan' => $canLinkStoryByPlan,
'canViewBug' => common::hasPriv('bug', 'view'),
'canAssignBug' => common::hasPriv('bug', 'assignto') && common::canModify('execution', $execution),
'canConfirmBug' => common::hasPriv('bug', 'confirm') && common::canModify('execution', $execution),
'canResolveBug' => common::hasPriv('bug', 'resolve') && common::canModify('execution', $execution),
'canCopyBug' => common::hasPriv('bug', 'create') && common::canModify('execution', $execution),
'canEditBug' => common::hasPriv('bug', 'edit') && common::canModify('execution', $execution),
'canDeleteBug' => common::hasPriv('bug', 'delete') && common::canModify('execution', $execution),
'canActivateBug' => common::hasPriv('bug', 'activate') && common::canModify('execution', $execution),
'canViewTask' => common::hasPriv('task', 'view'),
'canAssignTask' => common::hasPriv('task', 'assignto') && common::canModify('execution', $execution),
'canFinishTask' => common::hasPriv('task', 'finish') && common::canModify('execution', $execution),
'canPauseTask' => common::hasPriv('task', 'pause') && common::canModify('execution', $execution),
'canCancelTask' => common::hasPriv('task', 'cancel') && common::canModify('execution', $execution),
'canCloseTask' => common::hasPriv('task', 'close'),
'canActivateTask' => common::hasPriv('task', 'activate') && common::canModify('execution', $execution),
'canActivateStory' => common::hasPriv('story', 'activate') && common::canModify('execution', $execution),
'canStartTask' => common::hasPriv('task', 'start') && common::canModify('execution', $execution),
'canRestartTask' => common::hasPriv('task', 'restart') && common::canModify('execution', $execution),
'canEditTask' => common::hasPriv('task', 'edit') && common::canModify('execution', $execution),
'canDeleteTask' => common::hasPriv('task', 'delete') && common::canModify('execution', $execution),
'canRecordWorkhourTask' => common::hasPriv('task', 'recordWorkhour') && common::canModify('execution', $execution),
'canToStoryBug' => common::hasPriv('story', 'create') && common::canModify('execution', $execution),
'canAssignStory' => common::hasPriv('story', 'assignto') && common::canModify('execution', $execution),
'canEditStory' => common::hasPriv('story', 'edit') && common::canModify('execution', $execution),
'canDeleteStory' => common::hasPriv('story', 'delete') && common::canModify('execution', $execution),
'canChangeStory' => common::hasPriv('story', 'change') && common::canModify('execution', $execution),
'canCloseStory' => common::hasPriv('story', 'close'),
'canUnlinkStory' => (common::hasPriv('execution', 'unlinkStory') && !empty($execution->hasProduct)) && common::canModify('execution', $execution),
'canViewStory' => common::hasPriv('execution', 'storyView')
)
);
if(!$features['story']) unset($lang->kanban->type['story']);
if(!$features['qa']) unset($lang->kanban->type['bug']);
$executionItems = array();
foreach($executionList as $childExecution) $executionItems[] = array('text' => $childExecution->name, 'url' => createLink('execution', 'kanban', "kanbanID={$childExecution->id}"));
featureBar();
$editModule = $execution->multiple ? 'execution' : 'project';
$editParams = $execution->multiple ? "executionID={$execution->id}" : "projectID={$execution->project}";
toolbar
(
$groupMenu ? dropdown
(
btn
(
setClass('ghost btn btn-default'),
$this->lang->execution->kanbanGroup[$groupBy]
),
set::items($groupMenu)
) : null,
btnGroup
(
btn
(
set
(
array
(
'class' => 'btn ghost btn-default',
'url' => 'javascript:fullScreen();',
'icon' => 'fullscreen'
)
),
$lang->kanban->fullScreen
),
),
$operationMenu ? dropdown
(
btn
(
setClass('ghost btn btn-default'),
set::icon('cog-outline'),
$lang->settings
),
set::caret(false),
set::items($operationMenu)
) : null,
$createMenu ? dropdown
(
btn
(
setClass('primary btn btn-default'),
set::icon('plus'),
$lang->create,
),
set::items($createMenu)
) : null
);
div
(
set::id('kanbanList'),
zui::kanbanList
(
set::key('kanban'),
set::items($kanbanList),
set::height('calc(100vh - 120px)')
)
);
$linkStoryByPlanTips = $lang->execution->linkNormalStoryByPlanTips;
$linkStoryByPlanTips = $execution->multiple ? $linkStoryByPlanTips : str_replace($lang->execution->common, $lang->projectCommon, $linkStoryByPlanTips);
modal
(
setID('linkStoryByPlan'),
setData('size', '500px'),
set::modalProps(array('title' => $lang->execution->linkStoryByPlan)),
div
(
setClass('flex-auto'),
icon('info-sign', setClass('warning-pale rounded-full mr-1')),
$linkStoryByPlanTips
),
form
(
setClass('text-center', 'py-4'),
set::actions(array('submit')),
set::submitBtnText($lang->execution->linkStory),
formGroup
(
set::label($lang->execution->selectStoryPlan),
set::required(true),
setClass('text-left'),
picker
(
set::name('plan'),
set::required(true),
set::items($allPlans)
)
)
)
);
modal
(
setID('batchCreateStory'),
to::header
(
h4($lang->bug->product)
),
setData('size', '500px'),
inputGroup
(
setClass('mt-3'),
picker
(
set::width(300),
set::name('productName'),
set::items($productNames),
set::required(true),
set::onchange('changeStoryProduct()')
),
span
(
setClass('input-group-btn ml-2'),
btn
(
setClass('primary'),
setID('batchCreateStoryButton'),
set::url(createLink('story', 'batchCreate', 'productID=' . key($productNames) . '&branch=moduleID=0&storyID=0&executionID=' . $executionID)),
set('data-toggle', 'modal'),
set('data-dismiss', 'modal'),
set('data-size', 'lg'),
$lang->story->batchCreate
)
)
)
);
modal
(
setID('batchCreateBug'),
set::title($lang->bug->product),
setData('size', '500px'),
inputGroup
(
setClass('mt-3'),
picker
(
set::width(300),
set::name('productName'),
set::items($productNames),
set::required(true),
set::onchange('changeBugProduct()')
),
span
(
setClass('input-group-btn ml-2'),
btn
(
setClass('primary'),
setID('batchCreateBugButton'),
set::url(createLink('bug', 'batchCreate', 'productID=' . key($productNames) . '&branch=&executionID=' . $executionID)),
set('data-toggle', 'modal'),
set('data-dismiss', 'modal'),
set('data-size', 'lg'),
$lang->bug->batchCreate
)
)
)
);
module/execution/control.php
+1 -1
View File
@@ -1641,7 +1641,7 @@ class execution extends control
$this->app->loadLang('bug');
$this->app->loadLang('kanban');
$this->lang->execution->menu = new stdclass();
if($this->config->vision != 'lite') $this->lang->execution->menu = new stdclass();
$execution = $this->commonAction($executionID);
if($execution->type != 'kanban') return $this->locate(inlink('view', "executionID=$executionID"));