diff --git a/module/execution/control.php b/module/execution/control.php index 8be5dde37d..e926ae5554 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -125,7 +125,9 @@ class execution extends control $browseType = strtolower($status); /* Get products by execution. */ - $execution = $this->commonAction($executionID, $status); + $execution = $this->commonAction($executionID, $status); + if($execution->type == 'kanban') $this->locate($this->createLink('execution', 'kanban', "executionID=$executionID")); + $executionID = $execution->id; $products = $this->product->getProductPairsByProject($executionID); setcookie('preExecutionID', $executionID, $this->config->cookieLife, $this->config->webRoot, '', false, true); diff --git a/module/execution/model.php b/module/execution/model.php index 41c2016401..6d42ab9a32 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -72,6 +72,7 @@ class executionModel extends model /* Unset story, bug, build and testtask if type is ops. */ $execution = $this->getByID($executionID); + if($execution and $execution->type == 'kanban') $this->lang->execution->menu = new stdclass(); if($execution and $execution->type == 'stage' and $this->config->systemMode == 'new') { diff --git a/module/project/css/index.css b/module/project/css/index.css index 9b4d305bec..520109a797 100644 --- a/module/project/css/index.css +++ b/module/project/css/index.css @@ -26,3 +26,5 @@ .kanbans .kanban-actions {float: right; visibility: hidden;} .kanbans .kanban-actions .dropdown-menu.pull-right {top:31px; right: -84px; left: auto;} .kanbans .kanban-actions .dropdown-menu.pull-left {top:31px; right:-1px; left: auto;} + +.label-doing {background: #ff5d5d} diff --git a/module/project/js/index.js b/module/project/js/index.js index 1902408d91..8f88d4351d 100644 --- a/module/project/js/index.js +++ b/module/project/js/index.js @@ -1,6 +1,5 @@ /* Make cards clickable. */ -var $kanbans = $('.kanbans'); -$kanbans.on('click', '.panel', function(e) +$('#cards').on('click', '.panel', function(e) { if(!$(e.target).closest('.kanban-actions').length) { diff --git a/module/project/view/index.html.php b/module/project/view/index.html.php index 8ca002d7b9..184436e049 100644 --- a/module/project/view/index.html.php +++ b/module/project/view/index.html.php @@ -19,7 +19,7 @@ foreach($lang->project->featureBar as $label => $labelName) { $active = $browseType == $label ? 'btn-active-text' : ''; - echo html::a($this->createLink('project', 'index', "projectID=$project->id&browseType=" . $label), '' . $labelName . ' ' . ($browseType == $label ? "0" : ''), '', "class='btn btn-link $active'"); + echo html::a($this->createLink('project', 'index', "projectID=$project->id&browseType=" . $label), '' . $labelName . ' ' . ($browseType == $label ? "" . (int)count($kanbanList) . '' : ''), '', "class='btn btn-link $active'"); } ?> @@ -40,10 +40,10 @@ $kanban):?>