diff --git a/module/kanban/config.php b/module/kanban/config.php index 6ccc6603d1..0b0f56c5dc 100644 --- a/module/kanban/config.php +++ b/module/kanban/config.php @@ -117,6 +117,6 @@ $config->kanban->laneColorList = array('#3C4353', '#838A9D', '#476BDA', '#A65B $config->kanban->columnColorList = array('#333', '#2b519c', '#e48610', '#d2313d', '#2a9f23', '#777', '#d2691e', '#2e8b8b', '#2f8b58', '#4168e0', '#4b0082', '#f58072', '#ba55d3', '#6a8e22'); $config->kanban->cardColorList = array('#fff', '#937c5a', '#fc5959', '#ff9f46'); -$config->kanban->RDLaneOrder = array('epic' => 5, 'requirement' => 10, 'parentStory' => 15, 'story' => 20, 'bug' => 25, 'task' => 30); +$config->kanban->RDLaneOrder = array('parentStory' => 5, 'story' => 10, 'bug' => 15, 'task' => 20); $config->kanban->batchCreate = 10; diff --git a/module/kanban/lang/de.php b/module/kanban/lang/de.php index b030c8d0a2..1e9137abd0 100644 --- a/module/kanban/lang/de.php +++ b/module/kanban/lang/de.php @@ -249,8 +249,6 @@ $lang->kanban->defaultColumn['closed'] = 'close'; $lang->kanban->laneTypeList = array(); $lang->kanban->laneTypeList['parentStory'] = "Parent " . $lang->SRCommon; -$lang->kanban->laneTypeList['epic'] = $lang->ERCommon; -$lang->kanban->laneTypeList['requirement'] = $lang->URCommon; $lang->kanban->laneTypeList['story'] = $lang->SRCommon; $lang->kanban->laneTypeList['bug'] = 'Bug'; $lang->kanban->laneTypeList['task'] = 'Task'; diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php index bf476c7b2e..161c789a8a 100644 --- a/module/kanban/lang/en.php +++ b/module/kanban/lang/en.php @@ -249,8 +249,6 @@ $lang->kanban->defaultColumn['closed'] = 'close'; $lang->kanban->laneTypeList = array(); $lang->kanban->laneTypeList['parentStory'] = "Parent " . $lang->SRCommon; -$lang->kanban->laneTypeList['epic'] = $lang->ERCommon; -$lang->kanban->laneTypeList['requirement'] = $lang->URCommon; $lang->kanban->laneTypeList['story'] = $lang->SRCommon; $lang->kanban->laneTypeList['bug'] = 'Bug'; $lang->kanban->laneTypeList['task'] = 'Task'; diff --git a/module/kanban/lang/fr.php b/module/kanban/lang/fr.php index 837732b5d7..c9741e51ae 100644 --- a/module/kanban/lang/fr.php +++ b/module/kanban/lang/fr.php @@ -249,8 +249,6 @@ $lang->kanban->defaultColumn['closed'] = 'close'; $lang->kanban->laneTypeList = array(); $lang->kanban->laneTypeList['parentStory'] = "Parent " . $lang->SRCommon; -$lang->kanban->laneTypeList['epic'] = $lang->ERCommon; -$lang->kanban->laneTypeList['requirement'] = $lang->URCommon; $lang->kanban->laneTypeList['story'] = $lang->SRCommon; $lang->kanban->laneTypeList['bug'] = 'Bug'; $lang->kanban->laneTypeList['task'] = 'Task'; diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php index 023b02becf..dcff6da88f 100644 --- a/module/kanban/lang/zh-cn.php +++ b/module/kanban/lang/zh-cn.php @@ -249,8 +249,6 @@ $lang->kanban->defaultColumn['closed'] = '已关闭'; $lang->kanban->laneTypeList = array(); $lang->kanban->laneTypeList['parentStory'] = "父" . $lang->SRCommon; -$lang->kanban->laneTypeList['epic'] = $lang->ERCommon; -$lang->kanban->laneTypeList['requirement'] = $lang->URCommon; $lang->kanban->laneTypeList['story'] = $lang->SRCommon; $lang->kanban->laneTypeList['bug'] = 'Bug'; $lang->kanban->laneTypeList['task'] = '任务'; diff --git a/module/kanban/model.php b/module/kanban/model.php index 8d8b7292a7..535f43488e 100755 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -2531,15 +2531,8 @@ class kanbanModel extends model $index = 0; foreach($this->lang->kanban->laneTypeList as $type => $name) { - if($type == 'epic' && strpos($project->storyType, 'epic') === false) continue; - if($type == 'requirement' && strpos($project->storyType, 'requirement') === false) continue; - - /* 业务需求、用户需求和父软件需求共用同一个group. */ - if(!in_array($type, array('epic', 'requirement'))) - { - $groupID = $this->createGroup($executionID, $regionID); - if(dao::isError()) return false; - } + $groupID = $this->createGroup($executionID, $regionID); + if(dao::isError()) return false; $lane = new stdclass(); $lane->execution = $executionID; @@ -2554,20 +2547,7 @@ class kanbanModel extends model if(dao::isError()) return false; $laneID = $this->dao->lastInsertId(); - /* 业务需求、用户需求和父软件需求共用同一套看板列. */ - if(in_array($type, array('epic', 'requirement'))) - { - $columnIDList = $this->dao->select('id')->from(TABLE_KANBANCOLUMN)->where('deleted')->eq(0)->andWhere('archived')->eq(0)->andWhere('`group`')->eq($lane->group)->fetchPairs(); - foreach($columnIDList as $columnID) - { - $this->addKanbanCell($executionID, $laneID, $columnID, $lane->type); - if(dao::isError()) return false; - } - } - else - { - $this->createRDColumn($regionID, $groupID, $laneID, $type, $executionID); - } + $this->createRDColumn($regionID, $groupID, $laneID, $type, $executionID); $index ++; } @@ -2589,11 +2569,10 @@ class kanbanModel extends model public function createRDColumn(int $regionID, int $groupID, int $laneID, string $laneType, int $executionID) { $devColumnID = $testColumnID = $resolvingColumnID = 0; - if($laneType == 'story') $columnList = $this->lang->kanban->storyColumn; - if($laneType == 'bug') $columnList = $this->lang->kanban->bugColumn; - if($laneType == 'task') $columnList = $this->lang->kanban->taskColumn; - - if(in_array($laneType, array('parentStory', 'epic', 'requirement'))) $columnList = $this->lang->kanban->URSRColumn; + if($laneType == 'parentStory') $columnList = $this->lang->kanban->URSRColumn; + if($laneType == 'story') $columnList = $this->lang->kanban->storyColumn; + if($laneType == 'bug') $columnList = $this->lang->kanban->bugColumn; + if($laneType == 'task') $columnList = $this->lang->kanban->taskColumn; foreach($columnList as $type => $name) {