Merge branch 'sprint/183_mayue_47996' into 'master'

* Modify permissions.

See merge request easycorp/zentaopms!1666

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';

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);}});
         }

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)
         {