diff --git a/module/action/config.php b/module/action/config.php index 66a92f5a14..f0a6e2ec47 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -36,6 +36,7 @@ $config->action->objectNameFields['mr'] = 'title'; $config->action->objectNameFields['kanbancolumn'] = 'name'; $config->action->objectNameFields['kanbanlane'] = 'name'; $config->action->objectNameFields['kanbanspace'] = 'name'; +$config->action->objectNameFields['kanbanregion'] = 'name'; $config->action->objectNameFields['kanban'] = 'name'; $config->action->commonImgSize = 870; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 868c91e2fb..43ef3cb36d 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -542,6 +542,7 @@ $lang->action->label->design = 'Design|design|view|designID=%s'; $lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s'; $lang->action->label->api = 'Interface|api|index|libID=%s&moduleID=%s&apiID=%s'; $lang->action->label->kanbanspace = 'Kanban Space|kanban|space|browseType=all'; +$lang->action->label->kanbanregion = 'Kanban Region|kanban|view|kanbanID=%s'; $lang->action->label->kanban = 'Kanban|kanban|view|kanbanID=%s'; $lang->action->label->kanbancolumn = 'Kanban Column|execution|kanban|execution=%s'; $lang->action->label->kanbanlane = 'Kanban Lane|execution|kanban|execution=%s&type=all'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index c6fd0cc076..bd4d2972be 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -542,6 +542,7 @@ $lang->action->label->design = '设计|design|view|designID=%s'; $lang->action->label->stakeholder = '干系人|stakeholder|view|userID=%s'; $lang->action->label->api = '接口|api|index|libID=%s&moduleID=%s&apiID=%s'; $lang->action->label->kanbanspace = '看板空间|kanban|space|browseType=all'; +$lang->action->label->kanbanregion = '看板区域|kanban|view|kanbanID=%s'; $lang->action->label->kanban = '看板|kanban|view|kanbanID=%s'; $lang->action->label->kanbancolumn = '看板列|execution|kanban|execution=%s'; $lang->action->label->kanbanlane = '看板泳道|execution|kanban|execution=%s&type=all'; diff --git a/module/action/model.php b/module/action/model.php index d153117996..ef845917a0 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1233,6 +1233,12 @@ class actionModel extends model $action->objectLink = helper::createLink('assetlib', 'storyView', "storyID=$action->objectID"); } + if($action->objectType == 'kanbanregion') + { + $kanbanID = $this->dao->select('kanban')->from(TABLE_KANBANREGION)->where('id')->eq($action->objectID)->fetch('kanban'); + $action->objectLink = helper::createLink('kanban', 'view', "kanbanID=$kanbanID"); + } + return $action; } diff --git a/module/kanban/control.php b/module/kanban/control.php index 750b4a9b9b..551aa5f1ca 100644 --- a/module/kanban/control.php +++ b/module/kanban/control.php @@ -110,7 +110,7 @@ class kanban extends control $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); $this->view->spaceID = $spaceID; - $this->view->spacePairs = array('' => '') + $this->kanban->getSpacePairs(); + $this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs(); $this->display(); } @@ -138,7 +138,7 @@ class kanban extends control } $this->view->users = $this->loadModel('user')->getPairs('noletter|noclosed'); - $this->view->spacePairs = array('' => '') + $this->kanban->getSpacePairs(); + $this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs(); $this->view->kanban = $this->kanban->getByID($kanbanID); $this->display();