From 6ba1e7212d3a2b3dda2f8a588d0d20719fe5968d Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Fri, 21 Jan 2022 13:50:56 +0800
Subject: [PATCH] * Optimize code.

---
 module/group/lang/resource.php              |  4 +--
 module/kanban/control.php                   |  8 ++---
 module/kanban/js/view.js                    | 12 ++++----
 module/kanban/lang/en.php                   |  4 +--
 module/kanban/lang/zh-cn.php                |  4 +--
 module/kanban/model.php                     |  8 ++---
 module/kanban/view/setdonefunction.html.php | 34 ---------------------
 module/kanban/view/viewcard.html.php        |  2 +-
 8 files changed, 21 insertions(+), 55 deletions(-)
 delete mode 100644 module/kanban/view/setdonefunction.html.php

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index e0a6e1816f..f9ede55dc2 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -644,7 +644,7 @@ $lang->resource->kanban->close              = 'close';
 $lang->resource->kanban->delete             = 'delete';
 $lang->resource->kanban->createRegion       = 'createRegion';
 $lang->resource->kanban->editRegion         = 'editRegion';
-$lang->resource->kanban->setDoneFunction    = 'setDoneFunction';
+$lang->resource->kanban->performable        = 'performable';
 $lang->resource->kanban->sortRegion         = 'sortRegion';
 $lang->resource->kanban->sortGroup          = 'sortGroup';
 $lang->resource->kanban->deleteRegion       = 'deleteRegion';
@@ -670,7 +670,7 @@ $lang->resource->kanban->assigntoCard       = 'assigntoCard';
 $lang->resource->kanban->deleteCard         = 'deleteCard';
 $lang->resource->kanban->moveCard           = 'moveCard';
 $lang->resource->kanban->finishCard         = 'finishCard';
-$lang->resource->kanban->activeCard         = 'activeCard';
+$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/control.php b/module/kanban/control.php
index bde75c8692..0f75d68324 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -752,14 +752,14 @@ class kanban extends control
     }
 
     /**
-     * Active a card.
+     * Activate a card.
      *
      * @param  int    $cardID
      * @param  int    $kanbanID
      * @access public
      * @return void
      */
-    public function activeCard($cardID, $kanbanID)
+    public function activate($cardID, $kanbanID)
     {
         $this->dao->update(TABLE_KANBANCARD)->set('status')->eq('doing')->where('id')->eq($cardID)->exec();
         if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -1069,13 +1069,13 @@ class kanban extends control
     }
 
     /**
-     * Set done function.
+     * Setup done function.
      *
      * @param  int    $kanbanID
      * @access public
      * @return void
      */
-    public function setDoneFunction($kanbanID)
+    public function performable($kanbanID)
     {
         if(!empty($_POST))
         {
diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 5e298ae439..f6472f1932 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -257,7 +257,7 @@ function renderKanbanItem(item, $item)
 {
     var $title       = $item.children('.title');
     var privs        = item.actions;
-    var printMoreBtn = (privs.includes('editCard') || privs.includes('finishCard') || privs.includes('activeCard') ||privs.includes('archiveCard') || privs.includes('copyCard') || privs.includes('deleteCard') || privs.includes('moveCard') || privs.includes('setCardColor'));
+    var printMoreBtn = (privs.includes('editCard') || privs.includes('finishCard') || privs.includes('activateCard') ||privs.includes('archiveCard') || privs.includes('copyCard') || privs.includes('deleteCard') || privs.includes('moveCard') || privs.includes('setCardColor'));
 
     if(privs.includes('sortCard')) $item.parent().addClass('sort');
     if(!$title.length)
@@ -472,7 +472,7 @@ function finishCard(cardID, kanbanID, regionID)
 }
 
 /**
- * Active a card.
+ * Activate a card.
  *
  * @param  int $cardID
  * @param  int $kanbanID
@@ -480,10 +480,10 @@ function finishCard(cardID, kanbanID, regionID)
  * @access public
  * @return void
  */
-function activeCard(cardID, kanbanID, regionID)
+function activateCard(cardID, kanbanID, regionID)
 {
     if(!cardID) return false;
-    var url = createLink('kanban', 'activeCard', 'cardID=' + cardID + '&kanbanID=' + kanbanID);
+    var url = createLink('kanban', 'activateCard', 'cardID=' + cardID + '&kanbanID=' + kanbanID);
     return $.ajax(
     {
         method:   'post',
@@ -750,9 +750,9 @@ function createCardMenu(options)
     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('activeCard') && card.status != 'doing')
+        if(privs.includes('activateCard') && card.status != 'doing')
         {
-            items.push({label: kanbanLang.activeCard, icon: 'magic', onClick: function(){activeCard(card.id, card.kanban, card.region);}});
+            items.push({label: kanbanLang.activateCard, icon: 'magic', onClick: function(){activateCard(card.id, card.kanban, card.region);}});
         }
         else
         {
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 2cc8d684f4..08cadf01c1 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -28,7 +28,7 @@ $lang->kanban->deleteColumn        = 'Delete Column';
 $lang->kanban->createCard          = 'Create Card';
 $lang->kanban->editCard            = 'Edit Card';
 $lang->kanban->finishCard          = 'Finish Card';
-$lang->kanban->activeCard          = 'Active Card';
+$lang->kanban->activateCard        = 'Activate Card';
 $lang->kanban->viewCard            = 'View Card';
 $lang->kanban->archiveCard         = 'Archive Card';
 $lang->kanban->sortCard            = 'Sort Card';
@@ -39,7 +39,7 @@ $lang->kanban->setCardColor        = 'Set Card Color';
 $lang->kanban->deleteCard          = 'Delete Card';
 $lang->kanban->assigntoCard        = 'Assign';
 $lang->kanban->setting             = 'Setting';
-$lang->kanban->setDoneFunction     = 'Set done function';
+$lang->kanban->performable         = 'Set done function';
 $lang->kanban->doneFunction        = 'Done 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 88abfbd07a..40e8a61fb3 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -28,7 +28,7 @@ $lang->kanban->deleteColumn        = '删除看板列';
 $lang->kanban->createCard          = '创建卡片';
 $lang->kanban->editCard            = '编辑卡片';
 $lang->kanban->finishCard          = '完成卡片';
-$lang->kanban->activeCard          = '激活卡片';
+$lang->kanban->activateCard        = '激活卡片';
 $lang->kanban->viewCard            = '查看卡片';
 $lang->kanban->archiveCard         = '归档卡片';
 $lang->kanban->sortCard            = '卡片排序';
@@ -39,7 +39,7 @@ $lang->kanban->setCardColor        = '设置卡片颜色';
 $lang->kanban->deleteCard          = '删除卡片';
 $lang->kanban->assigntoCard        = '指派';
 $lang->kanban->setting             = '设置';
-$lang->kanban->setDoneFunction     = '设置完成功能';
+$lang->kanban->performable         = '设置完成功能';
 $lang->kanban->doneFunction        = '完成功能';
 $lang->kanban->splitColumn         = '新增子看板列';
 $lang->kanban->createColumnOnLeft  = '左侧新增看板列';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 140289a6b0..67c02813c5 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -872,7 +872,7 @@ class kanbanModel extends model
             ->andWhere('type')->eq('common')
             ->fetchAll();
 
-        $actions   = array('editCard', 'finishCard', 'activeCard', 'archiveCard', 'deleteCard', 'moveCard', 'setCardColor', 'viewCard', 'sortCard');
+        $actions   = array('editCard', 'finishCard', 'activateCard', 'archiveCard', 'deleteCard', 'moveCard', 'setCardColor', 'viewCard', 'sortCard');
         $cardGroup = array();
         foreach($cellList as $cell)
         {
@@ -2533,7 +2533,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', 'delete'));
+        $printSettingBtn = (common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'performable') or common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'delete'));
 
         if($printSettingBtn)
         {
@@ -2546,7 +2546,7 @@ class kanbanModel extends model
                 $actions .= '<li>' . html::a(helper::createLink('kanban', 'setLaneHeight', "kanbanID=$kanban->id", '', true), '<i class="icon icon-size-height"></i>' . $this->lang->kanban->laneHeight, '', "class='iframe btn btn-link' data-width='$width'") . '</li>';
 
             }
-            if(common::hasPriv('kanban', 'setDoneFunction')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'setDoneFunction', "kanbanID=$kanban->id", '', true), '<i class="icon icon-checked"></i>' . $this->lang->kanban->doneFunction, '', "class='iframe btn btn-link'") . '</li>';
+            if(common::hasPriv('kanban', 'performable')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'performable', "kanbanID=$kanban->id", '', true), '<i class="icon icon-checked"></i>' . $this->lang->kanban->doneFunction, '', "class='iframe btn btn-link'") . '</li>';
 
             $kanbanActions = '';
             $attr          = $kanban->status == 'closed' ? "disabled='disabled'" : '';
@@ -2555,7 +2555,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', 'delete'))) ? "<div class='divider'></div>" . $kanbanActions : $kanbanActions;
+                $actions .= ((common::hasPriv('kanban', 'createRegion') or $printSetHeight or common::hasPriv('kanban', 'performable')) and (common::hasPriv('kanban', 'edit') or common::hasPriv('kanban', 'close') or common::hasPriv('kanban', 'delete'))) ? "<div class='divider'></div>" . $kanbanActions : $kanbanActions;
             }
             $actions .= "</ul>";
         }
diff --git a/module/kanban/view/setdonefunction.html.php b/module/kanban/view/setdonefunction.html.php
deleted file mode 100644
index 869c57feba..0000000000
--- a/module/kanban/view/setdonefunction.html.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * The setdonefunction file of kanban module of ZenTaoPMS.
- *
- * @copyright   Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
- * @license     ZPL (http://zpl.pub/page/zplv12.html)
- * @author      Yue Ma <mayue@easycorp.ltd>
- * @package     kanban
- * @version     $Id: setdonefunction.html.php 935 2022-01-1 14:20:24Z $
- * @link        https://www.zentao.net
- */
-?>
-<?php include '../../common/view/header.html.php';?>
-<div id='mainContent' class='main-content'>
-  <div class='center-block'>
-    <div class='main-header'>
-      <h2><?php echo $lang->kanban->setDoneFunction;?></h2>
-    </div>
-    <form class='main-form form-ajax' method='post' enctype='multipart/form-data' id='dataform'>
-      <table class='table table-form'>
-        <tr>
-          <th><?php echo $lang->kanban->doneFunction;?></th>
-          <td><?php echo nl2br(html::radio('performable', $lang->kanban->enableFinished, $kanban->performable));?></td>
-        </tr>
-        <tr>
-          <td colspan='2' class='text-center form-actions'>
-            <?php echo html::submitButton();?>
-          </td>
-        </tr>
-      </table>
-    </form>
-  </div>
-</div>
-<?php include '../../common/view/footer.html.php';?>
diff --git a/module/kanban/view/viewcard.html.php b/module/kanban/view/viewcard.html.php
index 2d9b94fb30..663f2527ca 100644
--- a/module/kanban/view/viewcard.html.php
+++ b/module/kanban/view/viewcard.html.php
@@ -48,7 +48,7 @@
 
         if($kanban->performable)
         {
-            if($card->status == 'done') common::printLink('kanban', 'activeCard', "cardID={$card->id}&kanbanID={$kanban->id}", '<i class="icon icon-magic"></i>', '', "class='btn btn-link iframe' title='{$lang->kanban->activeCard}'", true, true);
+            if($card->status == 'done') common::printLink('kanban', 'activateCard', "cardID={$card->id}&kanbanID={$kanban->id}", '<i class="icon icon-magic"></i>', '', "class='btn btn-link iframe' title='{$lang->kanban->activateCard}'", true, true);
             if($card->status == 'doing') common::printLink('kanban', 'finishCard', "cardID={$card->id}&kanbanID={$kanban->id}", '<i class="icon icon-checked"></i>', '', "class='btn btn-link iframe' title='{$lang->kanban->finishCard}'", true, true);
         }