diff --git a/lib/zin/wg/gantt/js/v1.js b/lib/zin/wg/gantt/js/v1.js index b1d7410b0c..3fff4756d7 100644 --- a/lib/zin/wg/gantt/js/v1.js +++ b/lib/zin/wg/gantt/js/v1.js @@ -611,7 +611,7 @@ function initGantt() if(!canViewReview) return false; loadPage($.createLink('review', 'view', 'reviewID=' + task.reviewID)); } - if(task.type == 'plan' && !task.isParent) + if(task.type == 'plan' && !task.isParent && !(task.executionType == 'kanban' && task.isTpl)) { if(!canViewTaskList) return false; $.apps.open($.createLink('execution', 'task', 'id=' + task.id), 'execution'); diff --git a/module/execution/model.php b/module/execution/model.php index b006980ca4..561ef57634 100755 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -153,7 +153,6 @@ class executionModel extends model $this->config->hasDropmenuApps = array_diff($this->config->hasDropmenuApps, array('project', 'execution')); $this->lang->switcherMenu = ''; - unset($this->lang->execution->menu->kanban); unset($this->lang->execution->menu->burn); unset($this->lang->execution->menu->view); unset($this->lang->execution->menu->story); diff --git a/module/programplan/tao.php b/module/programplan/tao.php index ed816fe635..c1c8898ae6 100644 --- a/module/programplan/tao.php +++ b/module/programplan/tao.php @@ -643,6 +643,7 @@ class programplanTao extends programplanModel $data = new stdclass(); $data->id = $plan->id; $data->type = 'plan'; + $data->executionType = $plan->type; $data->text = empty($plan->milestone) ? $plan->name : $plan->name . $isMilestone; $data->name = $plan->name; $data->attribute = zget($this->lang->stage->typeList, $plan->attribute); @@ -656,6 +657,7 @@ class programplanTao extends programplanModel $data->realEnd = $realEnd ? substr($realEnd, 0, 10) : ''; $data->parent = $plan->grade == 1 ? 0 :$plan->parent; $data->isParent = $plan->isParent; + $data->isTpl = $plan->isTpl; $data->open = true; $data->start_date = $start; $data->endDate = $end; diff --git a/module/project/js/execution.ui.js b/module/project/js/execution.ui.js index fb34cd5df4..ed3a11f2da 100644 --- a/module/project/js/execution.ui.js +++ b/module/project/js/execution.ui.js @@ -61,7 +61,7 @@ window.onRenderCell = function(result, {col, row}) html += data.prefixLabel; } - if(data.type == 'point' || (executionType !== undefined && data.isParent)) + if(data.type == 'point' || (executionType !== undefined && data.isParent) || (data.type == 'kanban' && data.isTpl)) { if(result[0].props.href !== undefined) delete result[0].props.href; result[0].type = 'span';