From fdaf47943ee35a713a2b9c5bb07d2ccb193680b5 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 21 Jan 2022 13:17:56 +0800
Subject: [PATCH] * Code for task#47995.

---
 module/kanban/control.php    | 4 +++-
 module/kanban/lang/en.php    | 5 +++++
 module/kanban/lang/zh-cn.php | 2 +-
 module/kanban/model.php      | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 5c09090039..b577c2c9ce 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -800,6 +800,7 @@ class kanban extends control
             return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent'));
         }
 
+        /* Get cards to imported. */
         $cards2Imported = array();
         if($selectedKanbanID)
         {
@@ -820,11 +821,12 @@ class kanban extends control
         $pager          = new pager($recTotal, $recPerPage, $pageID);
         $cards2Imported = array_chunk($cards2Imported, $pager->recPerPage);
 
+        /* Find Kanban other than this kanban. */
         $kanbanPairs = $this->kanban->getKanbanPairs();
         unset($kanbanPairs[$kanbanID]);
 
         $this->view->cards2Imported   = empty($cards2Imported) ? $cards2Imported : $cards2Imported[$pageID - 1];
-        $this->view->kanbanPairs      = array(0 => $this->lang->kanban->all) + $kanbanPairs;
+        $this->view->kanbanPairs      = array($this->lang->kanban->all) + $kanbanPairs;
         $this->view->lanePairs        = $this->kanban->getLanePairsByGroup($groupID);
         $this->view->users            = $this->loadModel('user')->getPairs('noletter|nodeleted');
         $this->view->pager            = $pager;
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
index 8570d1359f..eb9623b016 100644
--- a/module/kanban/lang/en.php
+++ b/module/kanban/lang/en.php
@@ -58,6 +58,8 @@ $lang->kanban->restoreCard         = 'Restore Card';
 $lang->kanban->restore             = 'Restore';
 $lang->kanban->child               = 'Child';
 $lang->kanban->showClosed          = 'Closed';
+$lang->kanban->importCard          = 'Import Card';
+$lang->kanban->all                 = 'All Kanban';
 
 /* Fields. */
 $lang->kanban->space          = 'Space';
@@ -87,6 +89,9 @@ $lang->kanban->accessDenied  = "You have no access to the kanban.";
 $lang->kanban->confirmDelete = 'Do you want to delete this?';
 $lang->kanban->cardCountTip  = 'Please enter the number of cards';
 
+$lang->kanban->selectedKanban = 'Please select Kanban';
+$lang->kanban->selectedLane   = 'Target Lane';
+
 $lang->kanban->aclGroup['open']    = 'Open';
 $lang->kanban->aclGroup['private'] = 'Private';
 $lang->kanban->aclGroup['extend']  = 'Extend';
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index 0d9575a8e1..38b8408190 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -90,7 +90,7 @@ $lang->kanban->confirmDelete = '您确认删除吗？';
 $lang->kanban->cardCountTip  = '请输入卡片数量';
 
 $lang->kanban->selectedKanban = '请选择看板';
-$lang->kanban->selectedLane   = '请选择泳道';
+$lang->kanban->selectedLane   = '目标泳道';
 
 $lang->kanban->aclGroup['open']    = '公开';
 $lang->kanban->aclGroup['private'] = '私有';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index b09e9abdbc..ac712006fc 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -3008,7 +3008,7 @@ class kanbanModel extends model
      * @access public
      * @return array
      */
-    public function getCardsByObject($objectType = '', $objectID = 0, $archived = 0, $deleted = '0')
+    public function getCardsByObject($objectType = '', $objectID = 0, $archived = '0', $deleted = '0')
     {
         return $this->dao->select('*')->from(TABLE_KANBANCARD)
             ->where(true)