From cff61e144ddd92cb92c30d560b405cf1443d82d2 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Mon, 24 Jan 2022 09:32:24 +0800
Subject: [PATCH] *Fix bug

---
 module/kanban/control.php | 2 +-
 module/kanban/lang/en.php | 4 ++--
 module/kanban/model.php   | 6 +-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 39235b502c..0c95ce5e27 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -793,7 +793,7 @@ class kanban extends control
      * @access public
      * @return void
      */
-    public function activate($cardID, $kanbanID)
+    public function activateCard($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()));
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index c3b53dc588..1be24d92e6 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -100,10 +100,10 @@ $lang->kanban->aclGroup['extend']  = 'Extend';
 $lang->kanban->aclList['extend']  = 'Extend (Accessible with space view permissions)';
 $lang->kanban->aclList['private'] = 'Private (For the kanban team, whitelist members and space owner only)';
 
-$lang->kanban->archiveList['0'] = 'No Enable';
+$lang->kanban->archiveList['0'] = 'Disabled ';
 $lang->kanban->archiveList['1'] = 'Enable';
 
-$lang->kanban->enableFinished['0'] = 'No Enable';
+$lang->kanban->enableFinished['0'] = 'Disabled ';
 $lang->kanban->enableFinished['1'] = 'Enable';
 
 $lang->kanban->type = array();
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 01aceebba5..b8b8adc898 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -2635,11 +2635,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)
             {
-<<<<<<< module/kanban/model.php
-                $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 .= ((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;
->>>>>>> module/kanban/model.php
+                $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', 'enableArchived') or common::hasPriv('kanban', 'delete'))) ? "<div class='divider'></div>" . $kanbanActions : $kanbanActions;
             }
             $actions .= "</ul>";
         }