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

* Adjust code.

Browse Source
This commit is contained in:
tianshujie
2021-10-26 13:35:02 +08:00
parent f8447c9825
commit 83a1e66eab
2 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/config.php
-31
View File
@@ -17,34 +17,3 @@ $config->kanban->default->task = new stdclass();
$config->kanban->default->task->name = $lang->task->common;
$config->kanban->default->task->color = '#4169e1';
$config->kanban->default->task->order = '15';
$config->kanban->column = new stdclass();
$config->kanban->column->status['story']['backlog'] = 'active';
$config->kanban->column->status['story']['developing'] = 'active';
$config->kanban->column->status['story']['developed'] = 'active';
$config->kanban->column->status['story']['testing'] = 'active';
$config->kanban->column->status['story']['tested'] = 'active';
$config->kanban->column->status['story']['verified'] = 'active';
$config->kanban->column->status['story']['released'] = 'active';
$config->kanban->column->status['story']['closed'] = 'closed';
$config->kanban->column->status['bug']['unconfirmed'] = 'active';
$config->kanban->column->status['bug']['confirmed'] = 'active';
$config->kanban->column->status['bug']['fixed'] = 'resolved';
$config->kanban->column->status['bug']['closed'] = 'closed';
$config->kanban->column->status['task']['developing'] = 'doing';
$config->kanban->column->status['task']['developed'] = 'done';
$config->kanban->column->status['task']['wait'] = 'wait';
$config->kanban->column->status['task']['pause'] = 'pause';
$config->kanban->column->status['task']['canceled'] = 'canceled';
$config->kanban->column->status['task']['closed'] = 'closed';
$config->kanban->column->stage['story']['backlog'] = 'active';
$config->kanban->column->stage['story']['developing'] = 'developing';
$config->kanban->column->stage['story']['developed'] = 'developed';
$config->kanban->column->stage['story']['testing'] = 'testing';
$config->kanban->column->stage['story']['tested'] = 'tested';
$config->kanban->column->stage['story']['verified'] = 'verified';
$config->kanban->column->stage['story']['released'] = 'released';
$config->kanban->column->stage['story']['closed'] = 'closed';
module/kanban/model.php
+4 -4
View File
@@ -102,8 +102,8 @@ class kanbanModel extends model
if(strpos(',testing,tested,', $colType) !== false) $data->parent = $testColumnID;
if(strpos(',ready,develop,test,', $colType) === false)
{
$storyStatus = $this->config->kanban->column->status['story'][$colType];
$storyStage = $this->config->kanban->column->stage['story'][$colType];
$storyStatus = $this->config->kanban->storyColumnStatusList[$colType];
$storyStage = $this->config->kanban->storyColumnStageList[$colType];
foreach($objects as $storyID => $story)
{
if($story->status == $storyStatus and $story->stage == $storyStage) $data->cards .= $storyID . ',';
@@ -129,7 +129,7 @@ class kanbanModel extends model
if(strpos(',testing,tested,', $colType) !== false) $data->parent = $testColumnID;
if(strpos(',resolving,fixing,test,testing,tested,', $colType) === false)
{
$bugStatus = $this->config->kanban->column->status['bug'][$colType];
$bugStatus = $this->config->kanban->bugColumnStatusList[$colType];
foreach($objects as $bugID => $bug)
{
if($colType == 'unconfirmed' and $bug->status == $bugStatus and $bug->confirmed == 0)
@@ -164,7 +164,7 @@ class kanbanModel extends model
if(strpos(',developing,developed,', $colType) !== false) $data->parent = $devColumnID;
if(strpos(',develop,', $colType) === false)
{
$taskStatus = $this->config->kanban->column->status['task'][$colType];
$taskStatus = $this->config->kanban->taskColumnStatusList[$colType];
foreach($objects as $taskID => $task)
{
if($task->status == $taskStatus) $data->cards .= $taskID . ',';