diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 2de5740197..44c6f8f36a 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -669,8 +669,6 @@ $lang->resource->kanban->assigntoCard = 'assigntoCard'; //$lang->resource->kanban->copyCard = 'copyCard'; $lang->resource->kanban->deleteCard = 'deleteCard'; $lang->resource->kanban->moveCard = 'moveCard'; -$lang->resource->kanban->finishCard = 'finishCard'; -$lang->resource->kanban->activateCard = 'activateCard'; $lang->resource->kanban->setCardColor = 'setCardColor'; $lang->resource->kanban->laneMove = 'laneMove'; $lang->resource->kanban->viewArchivedColumn = 'viewArchivedColumn'; diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index bddc145cb2..e8efd1d2f3 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -1073,9 +1073,9 @@ function createCardMenu(options) var items = []; if(privs.includes('editCard')) items.push({label: kanbanLang.editCard, icon: 'edit', url: createLink('kanban', 'editCard', 'cardID=' + card.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}}); - if(kanban.performable == 1) + if(privs.includes('performable') && kanban.performable == 1) { - if(privs.includes('activateCard') && card.status != 'doing') + if(card.status != 'doing') { items.push({label: kanbanLang.activateCard, icon: 'magic', onClick: function(){activateCard(card.id, card.kanban, card.region);}}); } diff --git a/module/kanban/model.php b/module/kanban/model.php index a8990e7617..0b332d0cb9 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -1036,7 +1036,7 @@ class kanbanModel extends model ->andWhere('type')->eq('common') ->fetchAll(); - $actions = array('editCard', 'finishCard', 'activateCard', 'archiveCard', 'deleteCard', 'moveCard', 'setCardColor', 'viewCard', 'sortCard', 'viewExecution', 'viewPlan', 'viewRelease', 'viewBuild'); + $actions = array('editCard', 'performable', 'archiveCard', 'deleteCard', 'moveCard', 'setCardColor', 'viewCard', 'sortCard', 'viewExecution', 'viewPlan', 'viewRelease', 'viewBuild'); $cardGroup = array(); foreach($cellList as $cell) {