From f06c5c5e30f8c5d864b0f9e1daa4068d4728d96e Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Mon, 24 Jan 2022 08:36:25 +0800
Subject: [PATCH] *Finish task 47997 48003.

---
 db/update16.2.sql                               | 2 +-
 module/kanban/control.php                       | 4 ++--
 module/kanban/lang/en.php                       | 2 +-
 module/kanban/lang/zh-cn.php                    | 2 +-
 module/kanban/model.php                         | 6 +++---
 module/kanban/view/setarchivedfunction.html.php | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/db/update16.2.sql b/db/update16.2.sql
index f2d290914f..391d35bf3e 100644
--- a/db/update16.2.sql
+++ b/db/update16.2.sql
@@ -4,7 +4,7 @@ UPDATE `zt_kanbanspace` SET `type` = 'cooperation';
 ALTER TABLE `zt_kanban` ADD `importObject` varchar(255) NOT NULL AFTER `displayCards`;
 ALTER TABLE `zt_kanban` ADD `performable` enum ('0', '1') NOT NULL DEFAULT '0' AFTER `archived`;
 
-ALTER TABLE `zt_kanbancard` ADD `fromID` int NOT NULL  AFTER `group`;
+ALTER TABLE `zt_kanbancard` ADD `fromID` int(8) NOT NULL  AFTER `group`;
 ALTER TABLE `zt_kanbancard` ADD `fromType` varchar(50) NOT NULL AFTER `fromID`;
 
 ALTER TABLE `zt_job` ADD `sonarqubeServer` mediumint(8) unsigned NOT NULL AFTER `triggerType`;
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 256c2c5771..8d0535bef3 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1057,13 +1057,13 @@ class kanban extends control
     }
   
     /**
-     * Set done function.
+     * Set archived.
      *
      * @param  int    $kanbanID
      * @access public
      * @return void
      */
-    public function setArchivedFunction($kanbanID)
+    public function enableArchived($kanbanID)
     {
         if(!empty($_POST))
         {
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 16c5c91e17..06e443bbf1 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -39,7 +39,7 @@ $lang->kanban->assigntoCard        = 'Assign';
 $lang->kanban->setting             = 'Setting';
 $lang->kanban->setDoneFunction     = 'Set Done Function';
 $lang->kanban->doneFunction        = 'Done Function';
-$lang->kanban->setArchivedFunction = 'Set Archived Function';
+$lang->kanban->enableArchived      = 'Set Archived Function';
 $lang->kanban->ArchivedFunction    = 'Archived Function';
 $lang->kanban->splitColumn         = 'Split Column';
 $lang->kanban->createColumnOnLeft  = 'Create Column On Left';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index a907a0f9b7..2902314bd0 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -39,7 +39,7 @@ $lang->kanban->assigntoCard        = '指派';
 $lang->kanban->setting             = '设置';
 $lang->kanban->setDoneFunction     = '设置完成功能';
 $lang->kanban->doneFunction        = '完成功能';
-$lang->kanban->setArchivedFunction = '设置归档功能';
+$lang->kanban->enableArchived      = '设置归档功能';
 $lang->kanban->ArchivedFunction    = '归档功能';
 $lang->kanban->splitColumn         = '新增子看板列';
 $lang->kanban->createColumnOnLeft  = '左侧新增看板列';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 0034bdd01c..e04d42935e 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -2538,7 +2538,7 @@ class kanbanModel extends model
         $actions .= "<div class='btn-group'>";
         $actions .= "<a href='javascript:fullScreen();' id='fullScreenBtn' class='btn btn-link'><i class='icon icon-fullscreen'></i> {$this->lang->kanban->fullScreen}</a>";
 
-        $printSettingBtn = (common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'setDoneFunction') or common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'setArchivedFunction') or common::hasPriv('kanban', 'delete'));
+        $printSettingBtn = (common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'setDoneFunction') or common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'enableArchived') or common::hasPriv('kanban', 'delete'));
 
         if($printSettingBtn)
         {
@@ -2546,7 +2546,7 @@ class kanbanModel extends model
             $actions .= "<ul id='kanbanActionMenu' class='dropdown-menu text-left'>";
             if(common::hasPriv('kanban', 'createRegion')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'createRegion', "kanbanID=$kanban->id", '', true), '<i class="icon icon-plus"></i>' . $this->lang->kanban->createRegion, '', "class='iframe btn btn-link'") . '</li>';
             if(common::hasPriv('kanban', 'import')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'import', "kanbanID=$kanban->id", '', true), '<i class="icon icon-import"></i>' . $this->lang->kanban->import, '', "class='iframe btn btn-link'") . '</li>';
-            if(common::hasPriv('kanban', 'setArchivedFunction')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'setArchivedFunction', "kanbanID=$kanban->id", '', true), '<i class="icon icon-card-archive"></i>' . $this->lang->kanban->archived, '', "class='iframe btn btn-link'") . '</li>';
+            if(common::hasPriv('kanban', 'enableArchived')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'enableArchived', "kanbanID=$kanban->id", '', true), '<i class="icon icon-card-archive"></i>' . $this->lang->kanban->archived, '', "class='iframe btn btn-link'") . '</li>';
             if($printSetHeight)
             {
                 $width    = $this->app->getClientLang() == 'en' ? '70%' : '60%';
@@ -2562,7 +2562,7 @@ class kanbanModel extends model
             if(common::hasPriv('kanban', 'delete')) $kanbanActions .= '<li>' . html::a(helper::createLink('kanban', 'delete', "kanbanID=$kanban->id"), '<i class="icon icon-trash"></i>' . $this->lang->kanban->delete, 'hiddenwin', "class='btn btn-link'") . '</li>';
             if($kanbanActions)
             {
-                $actions .= ((common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'setDoneFunction')) and (common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'setArchivedFunction') or common::hasPriv('kanban', 'delete'))) ? "<div class='divider'></div>" . $kanbanActions : $kanbanActions;
+                $actions .= ((common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'setDoneFunction')) and (common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'enableArchived') or common::hasPriv('kanban', 'delete'))) ? "<div class='divider'></div>" . $kanbanActions : $kanbanActions;
             }
             $actions .= "</ul>";
         }
diff --git a/module/kanban/view/setarchivedfunction.html.php b/module/kanban/view/setarchivedfunction.html.php
index cb1ae20bc2..f50b8f665d 100644
--- a/module/kanban/view/setarchivedfunction.html.php
+++ b/module/kanban/view/setarchivedfunction.html.php
@@ -14,7 +14,7 @@
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
-      <h2><?php echo $lang->kanban->setArchivedFunction;?></h2>
+      <h2><?php echo $lang->kanban->enableArchived;?></h2>
     </div>
     <form class='main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
       <table class='table table-form'>