diff --git a/module/action/config.php b/module/action/config.php index 32c2839d62..54d57c603e 100755 --- a/module/action/config.php +++ b/module/action/config.php @@ -48,5 +48,5 @@ $config->action->majorList['project'] = array('opened', 'edited'); $config->action->majorList['execution'] = array('opened', 'edited'); $config->action->needGetProjectType = 'build,task,bug,case,testcase,caselib,testtask,testsuite,testreport,doc,issue,release,risk,design,opportunity,trainplan,gapanalysis,researchplan,researchreport,'; -$config->action->needGetRelateField = ',story,productplan,release,task,build,bug,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,researchplan,researchreport,meeting,kanbanlane,'; +$config->action->needGetRelateField = ',story,productplan,release,task,build,bug,case,testtask,testreport,doc,doclib,issue,risk,opportunity,trainplan,gapanalysis,team,whitelist,researchplan,researchreport,meeting,kanbanlane,kanbancolumn,'; $config->action->noLinkModules = ',doclib,module,webhook,gitlab,pipeline,jenkins,'; diff --git a/module/action/model.php b/module/action/model.php index 1dd3dd2c30..8c289f283e 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -198,6 +198,7 @@ class actionModel extends model if($objectType == 'story') $record->project = $this->dao->select('project')->from(TABLE_PROJECTSTORY)->where('story')->eq($objectID)->orderBy('project_desc')->limit(1)->fetch('project'); if($objectType == 'release') $record->project = $this->dao->select('project')->from(TABLE_BUILD)->where('id')->eq($record->build)->fetch('project'); if($objectType == 'kanbanlane') $record->execution = $this->dao->select($fields)->from(TABLE_KANBANLANE)->where('id')->eq($objectID)->fetch('execution'); + if($objectType == 'kanbancolumn') $record->execution = $extra; if($objectType == 'team') { $team = $this->dao->select('type')->from(TABLE_PROJECT)->where('id')->eq($objectID)->fetch(); diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js index eeace37eef..1460f8137a 100644 --- a/module/execution/js/kanban.js +++ b/module/execution/js/kanban.js @@ -265,7 +265,7 @@ function renderHeaderCol($col, col, $header, kanban) */ function renderLaneName($name, lane, $kanban, columns, kanban) { - if(!$name.children('.actions').length && (priv.hasSetLane || priv.hasLaneMove)) + if(!$name.children('.actions').length && (priv.canSetLane || priv.canMoveLane)) { $([ '
',