From caac43d649090903a10a72f776c5acf97d4d0c45 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@easycorp.ltd>
Date: Sat, 7 Oct 2023 16:14:36 +0800
Subject: [PATCH] * Fix bug#38929, #39216.

---
 module/group/lang/resource.php  | 2 ++
 module/group/packagemanager.php | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 25514ff024..039bb99137 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -724,6 +724,8 @@ $lang->resource->kanban->viewArchivedColumn = 'viewArchivedColumn';
 $lang->resource->kanban->viewArchivedCard   = 'viewArchivedCard';
 $lang->resource->kanban->restoreCard        = 'restoreCard';
 $lang->resource->kanban->batchCreateCard    = 'batchCreateCard';
+$lang->resource->kanban->finishCard         = 'finishCard';
+$lang->resource->kanban->activateCard       = 'activateCard';
 
 $lang->kanban->methodOrder[5]   = 'space';
 $lang->kanban->methodOrder[10]  = 'createSpace';
diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php
index d30314ac3d..9e06017351 100644
--- a/module/group/packagemanager.php
+++ b/module/group/packagemanager.php
@@ -3142,7 +3142,7 @@ $config->group->package->manageKanban->privs['kanban-editLaneColor']      = arra
 $config->group->package->manageKanban->privs['kanban-editLaneName']       = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 20, 'depend' => array('kanban-view'), 'recommend' => array('kanban-createLane', 'kanban-deleteLane', 'kanban-editLaneColor', 'kanban-sortGroup', 'kanban-sortLane'));
 $config->group->package->manageKanban->privs['kanban-splitColumn']        = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 6, 'depend' => array('kanban-view'), 'recommend' => array('kanban-archiveColumn', 'kanban-createColumn', 'kanban-deleteColumn', 'kanban-restoreColumn', 'kanban-setColumn', 'kanban-setWIP', 'kanban-sortColumn', 'kanban-viewArchivedColumn'));
 $config->group->package->manageKanban->privs['kanban-archiveColumn']      = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 10, 'depend' => array('kanban-view'), 'recommend' => array('kanban-createColumn', 'kanban-deleteColumn', 'kanban-restoreColumn', 'kanban-setColumn', 'kanban-setWIP', 'kanban-sortColumn', 'kanban-splitColumn', 'kanban-viewArchivedColumn'));
-$config->group->package->manageKanban->privs['kanban-restoreColumn']      = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 12, 'depend' => array('kanban-view'), 'recommend' => array('kanban-archiveColumn', 'kanban-createColumn', 'kanban-deleteColumn', 'kanban-setColumn', 'kanban-setWIP', 'kanban-sortColumn', 'kanban-splitColumn', 'kanban-viewArchivedColumn'));
+$config->group->package->manageKanban->privs['kanban-restoreColumn']      = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 12, 'depend' => array('kanban-viewArchivedColumn'), 'recommend' => array('kanban-archiveColumn', 'kanban-createColumn', 'kanban-deleteColumn', 'kanban-setColumn', 'kanban-setWIP', 'kanban-sortColumn', 'kanban-splitColumn', 'kanban-viewArchivedColumn'));
 
 $config->group->package->deleteKanban = new stdclass();
 $config->group->package->deleteKanban->order  = 15;
@@ -3330,6 +3330,8 @@ $config->group->package->manageCard->privs['kanban-batchCreateCard']  = array('e
 $config->group->package->manageCard->privs['kanban-archiveCard']      = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 9, 'depend' => array('kanban-view'), 'recommend' => array('kanban-createCard', 'kanban-deleteCard', 'kanban-editCard', 'kanban-moveCard', 'kanban-restoreCard', 'kanban-setCardColor', 'kanban-sortCard', 'kanban-viewArchivedCard', 'kanban-viewCard'));
 $config->group->package->manageCard->privs['kanban-viewArchivedCard'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 10, 'depend' => array('kanban-view'), 'recommend' => array('kanban-archiveCard', 'kanban-createCard', 'kanban-deleteCard', 'kanban-editCard', 'kanban-moveCard', 'kanban-restoreCard', 'kanban-setCardColor', 'kanban-sortCard', 'kanban-viewCard'));
 $config->group->package->manageCard->privs['kanban-restoreCard']      = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 11, 'depend' => array('kanban-view'), 'recommend' => array('kanban-archiveCard', 'kanban-createCard', 'kanban-deleteCard', 'kanban-editCard', 'kanban-moveCard', 'kanban-setCardColor', 'kanban-sortCard', 'kanban-viewArchivedCard', 'kanban-viewCard'));
+$config->group->package->manageCard->privs['kanban-finishCard']       = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 11, 'depend' => array('kanban-view'), 'recommend' => array('kanban-archiveCard', 'kanban-createCard', 'kanban-deleteCard', 'kanban-editCard', 'kanban-moveCard', 'kanban-setCardColor', 'kanban-sortCard', 'kanban-viewArchivedCard', 'kanban-viewCard'));
+$config->group->package->manageCard->privs['kanban-activateCard']     = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 11, 'depend' => array('kanban-view'), 'recommend' => array('kanban-archiveCard', 'kanban-createCard', 'kanban-deleteCard', 'kanban-editCard', 'kanban-moveCard', 'kanban-setCardColor', 'kanban-sortCard', 'kanban-viewArchivedCard', 'kanban-viewCard'));
 
 $config->group->package->browseProjectStory = new stdclass();
 $config->group->package->browseProjectStory->order  = 5;