diff --git a/module/execution/control.php b/module/execution/control.php index b4b4af9ebf..35fa6b8c2a 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2148,20 +2148,28 @@ class execution extends control $this->app->loadLang('story'); $this->app->loadLang('task'); $this->app->loadLang('bug'); + $this->loadModel('kanban'); /* Compatibility IE8. */ if(strpos($this->server->http_user_agent, 'MSIE 8.0') !== false) header("X-UA-Compatible: IE=EmulateIE7"); - $kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy); + $this->execution->setMenu($executionID); + $execution = $this->execution->getById($executionID); + if($execution->lifetime == 'ops') + { + $browseType = 'task'; + unset($this->lang->kanban->type['story']); + unset($this->lang->kanban->type['bug']); + unset($this->lang->kanban->type['all']); + } + + $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy); if(empty($kanbanGroup)) { $this->kanban->createExecutionLane($executionID, $browseType, $groupBy); $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy); } - $this->execution->setMenu($executionID); - $execution = $this->loadModel('execution')->getById($executionID); - /* Determines whether an object is editable. */ $canBeChanged = common::canModify('execution', $execution); diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php index 39157b9dd8..46b9fad67d 100644 --- a/module/execution/view/task.html.php +++ b/module/execution/view/task.html.php @@ -133,10 +133,13 @@ body {margin-bottom: 25px;} $link = common::hasPriv('execution', 'importTask') ? $this->createLink('execution', 'importTask', "execution=$execution->id") : '#'; echo "
  • " . html::a($link, $lang->execution->importTask, '', $misc) . "
  • "; - $class = common::hasPriv('execution', 'importBug') ? '' : "class=disabled"; - $misc = common::hasPriv('execution', 'importBug') ? "class='import'" : "class=disabled"; - $link = common::hasPriv('execution', 'importBug') ? $this->createLink('execution', 'importBug', "execution=$execution->id") : '#'; - echo "
  • " . html::a($link, $lang->execution->importBug, '', $misc) . "
  • "; + if($execution->lifetime != 'ops') + { + $class = common::hasPriv('execution', 'importBug') ? '' : "class=disabled"; + $misc = common::hasPriv('execution', 'importBug') ? "class='import'" : "class=disabled"; + $link = common::hasPriv('execution', 'importBug') ? $this->createLink('execution', 'importBug', "execution=$execution->id") : '#'; + echo "
  • " . html::a($link, $lang->execution->importBug, '', $misc) . "
  • "; + } ?> diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php index 0c16c7506e..2f4a0d4a2a 100644 --- a/module/execution/view/taskkanban.html.php +++ b/module/execution/view/taskkanban.html.php @@ -49,9 +49,12 @@ $link = common::hasPriv('execution', 'importTask') ? $this->createLink('execution', 'importTask', "execution=$execution->id") : '#'; echo "
  • " . html::a($link, $lang->execution->importTask, '', $misc) . "
  • "; - $misc = common::hasPriv('execution', 'importBug') ? '' : "class=disabled"; - $link = common::hasPriv('execution', 'importBug') ? $this->createLink('execution', 'importBug', "execution=$execution->id") : '#'; - echo "
  • " . html::a($link, $lang->execution->importBug, '', $misc) . "
  • "; + if($execution->lifetime != 'ops') + { + $misc = common::hasPriv('execution', 'importBug') ? '' : "class=disabled"; + $link = common::hasPriv('execution', 'importBug') ? $this->createLink('execution', 'importBug', "execution=$execution->id") : '#'; + echo "
  • " . html::a($link, $lang->execution->importBug, '', $misc) . "
  • "; + } ?> @@ -90,6 +93,7 @@