From 23bec4a9edf4711617e87f466d89b6a22251d899 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 20 Dec 2021 08:43:34 +0800 Subject: [PATCH] * Modify code format. --- module/action/model.php | 6 +++--- module/kanban/js/view.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/action/model.php b/module/action/model.php index 30797f7bb4..bbbfe9ae0a 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -568,7 +568,7 @@ class actionModel extends model $typeTrashes[$object->objectType][] = $object->objectID; } - $kanban = array('kanbanspace', 'kanban', 'kanbanregion', 'kanbanlane', 'kanbancolumn', 'kanbancard'); + $kanbanModuleList = array('kanbanspace', 'kanban', 'kanbanregion', 'kanbanlane', 'kanbancolumn', 'kanbancard'); foreach($typeTrashes as $objectType => $objectIdList) { if(!isset($this->config->objectTables[$objectType])) continue; @@ -581,7 +581,7 @@ 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(in_array($objectType, $kanban)) + elseif(in_array($objectType, $kanbanModuleList)) { $objectNames[$objectType] = $this->dao->select("*")->from($table)->where('id')->in($objectIdList)->fetchAll('id'); } @@ -602,7 +602,7 @@ class actionModel extends model $trash->objectType = $objectType; $trash->objectName = isset($objectNames[$objectType][$trash->objectID]) ? $objectNames[$objectType][$trash->objectID] : ''; } - elseif(in_array($objectType, $kanban)) + elseif(in_array($objectType, $kanbanModuleList)) { if($trash->objectID == 0) { diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js index ddd25332e6..a445e44cc4 100644 --- a/module/kanban/js/view.js +++ b/module/kanban/js/view.js @@ -821,7 +821,8 @@ $(function() if($ele.hasClass('kanban-lane')) { sortType = 'lane'; - $cards = $ele.find('.kanban-item'); + $cards = $ele.find('.kanban-item'); + $cards.hide(); return $ele.parent().children('.kanban-lane'); }