* Modify kanban judgment in recycle bin.

module/action/lang/en.php

@@ -121,12 +121,12 @@ $lang->action->objectTypes['mr']            = 'Merge Request';
 $lang->action->objectTypes['gitlabproject'] = 'GitLab Project';
 $lang->action->objectTypes['gitlabuser']    = 'GitLab User';
 $lang->action->objectTypes['gitlabgroup']   = 'GitLab Group';
-$lang->action->objectTypes['kanbanspace']   = 'Space';
+$lang->action->objectTypes['kanbanspace']   = 'Kanban Space';
 $lang->action->objectTypes['kanban']        = 'Kanban';
-$lang->action->objectTypes['kanbanregion']  = 'Region';
-$lang->action->objectTypes['kanbanlane']    = 'Lane';
-$lang->action->objectTypes['kanbancolumn']  = 'Column';
-$lang->action->objectTypes['kanbancard']    = 'Card';
+$lang->action->objectTypes['kanbanregion']  = 'Kanban Region';
+$lang->action->objectTypes['kanbanlane']    = 'Kanban Lane';
+$lang->action->objectTypes['kanbancolumn']  = 'Kanban Column';
+$lang->action->objectTypes['kanbancard']    = 'Kanban Card';
 
 /* Used to describe operation history. */
 $lang->action->desc = new stdclass();

module/action/lang/zh-cn.php

@@ -121,12 +121,12 @@ $lang->action->objectTypes['mr']            = '合并请求';
 $lang->action->objectTypes['gitlabproject'] = 'GitLab项目';
 $lang->action->objectTypes['gitlabuser']    = 'GitLab用户';
 $lang->action->objectTypes['gitlabgroup']   = 'GitLab群组';
-$lang->action->objectTypes['kanbanspace']   = '空间';
+$lang->action->objectTypes['kanbanspace']   = '看板空间';
 $lang->action->objectTypes['kanban']        = '看板';
-$lang->action->objectTypes['kanbanregion']  = '区域';
-$lang->action->objectTypes['kanbanlane']    = '泳道';
-$lang->action->objectTypes['kanbancolumn']  = '列';
-$lang->action->objectTypes['kanbancard']    = '卡片';
+$lang->action->objectTypes['kanbanregion']  = '看板区域';
+$lang->action->objectTypes['kanbanlane']    = '看板泳道';
+$lang->action->objectTypes['kanbancolumn']  = '看板列';
+$lang->action->objectTypes['kanbancard']    = '看板卡片';
 
 
 /* 用来描述操作历史记录。*/

module/action/model.php

@@ -568,6 +568,7 @@ class actionModel extends model
             $typeTrashes[$object->objectType][] = $object->objectID;
         }
 
+        $kanban = array('kanbanspace', 'kanban', 'kanbanregion', 'kanbanlane', 'kanbancolumn', 'kanbancard');
         foreach($typeTrashes as $objectType => $objectIdList)
         {
             if(!isset($this->config->objectTables[$objectType])) continue;
@@ -580,9 +581,9 @@ class actionModel extends model
                 $objectNames['jenkins'] = $this->dao->select("id, $field AS name")->from($table)->where('id')->in($objectIdList)->andWhere('type')->eq('jenkins')->fetchPairs();
                 $objectNames['gitlab']  = $this->dao->select("id, $field AS name")->from($table)->where('id')->in($objectIdList)->andWhere('type')->eq('gitlab')->fetchPairs();
             }
-            elseif(strpos($objectType, 'kanban') >= 0)
+            elseif(in_array($objectType, $kanban))
             {
-                $objectNames[$objectType] = $this->dao->select("*, $field AS field")->from($table)->where('id')->in($objectIdList)->fetchAll('id');
+                $objectNames[$objectType] = $this->dao->select("*")->from($table)->where('id')->in($objectIdList)->fetchAll('id');
             }
             else
             {
@@ -599,30 +600,24 @@ class actionModel extends model
                 if(isset($objectNames['gitlab'][$trash->objectID]))  $objectType = 'gitlab';
                 if(isset($objectNames['jenkins'][$trash->objectID])) $objectType = 'jenkins';
                 $trash->objectType = $objectType;
+                $trash->objectName = isset($objectNames[$objectType][$trash->objectID]) ? $objectNames[$objectType][$trash->objectID] : '';
             }
-            elseif(strpos($objectType, 'kanban') >= 0)
+            elseif(in_array($objectType, $kanban))
             {
-                if($trash->objectID == 0) $trash->openID = 0;
+                if($trash->objectID == 0)
+                {
+                    $trash->kanbanID = 0;
+                }
                 elseif($objectType == 'kanbanregion')
                 {
-                    $trash->openID = $objectNames[$objectType][$trash->objectID]->kanban;
+                    $trash->kanbanID = $objectNames[$objectType][$trash->objectID]->kanban;
                 }
-                elseif($objectType == 'kanbanlane' or $objectType == 'kanbancolumn' or $objectType == 'kanbancard')
+                elseif(in_array($objectType, array('kanbanlane', 'kanbancolumn', 'kanbancard')))
                 {
-                    $trash->openID = $this->loadModel('kanban')->getRegionById($objectNames[$objectType][$trash->objectID]->region)->kanban;
+                    $trash->kanbanID = $this->loadModel('kanban')->getRegionById($objectNames[$objectType][$trash->objectID]->region)->kanban;
                 }
-                elseif($objectType == 'kanban')
-                {
-                    $trash->openID = $objectNames[$objectType][$trash->objectID]->space;
-                }
-                else
-                {
-                    $trash->openID = $objectNames[$objectType][$trash->objectID]->id;
-                }
-                $trash->objectName = isset($objectNames[$objectType][$trash->objectID]->field) ? $objectNames[$objectType][$trash->objectID]->field : '';
-                continue;
+                $trash->objectName = isset($objectNames[$objectType][$trash->objectID]->name) ? $objectNames[$objectType][$trash->objectID]->name : '';
             }
-            $trash->objectName = isset($objectNames[$objectType][$trash->objectID]) ? $objectNames[$objectType][$trash->objectID] : '';
         }
         return $trashes;
     }

module/action/view/trash.html.php

@@ -71,13 +71,13 @@
             {
                 echo $action->objectName;
             }
-            elseif($action->objectType == 'kanban' or $action->objectType == 'kanbanspce')
+            elseif(in_array($action->objectType, array('kanban', 'kanbanspace')))
             {
                 echo html::a($this->createLink('kanban', 'space'), $action->objectName, '_self', "title={$action->objectName}");
             }
-            elseif(strpos($action->objectType, 'kanban') >= 0)
+            elseif(in_array($action->objectType, array('kanbanregion', 'kanbanlane', 'kanbancolumn', 'kanbancard')))
             {
-                echo html::a($this->createLink('kanban', 'view', "kanbanID={$action->openID}"), $action->objectName, '_self', "title={$action->objectName}");
+                echo html::a($this->createLink('kanban', 'view', "kanbanID={$action->kanbanID}"), $action->objectName, '_self', "title={$action->objectName}");
             }
             else
             {

module/kanban/js/view.js

@@ -801,7 +801,6 @@ $(function()
     {
         selector: '.region, .kanban-board, .kanban-lane',
         trigger: '.region.sort > .region-header, .kanban-board.sort > .kanban-header > .kanban-group-header, .kanban-lane.sort > .kanban-lane-name',
-        listenClick : false,
         targetSelector: function($ele)
         {
             /* Sort regions */