Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Modify code format.

Browse Source
This commit is contained in:
liumengyi
2021-12-20 08:43:34 +08:00
parent 79c523399b
commit 23bec4a9ed
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+3 -3
View File
@@ -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)
{
module/kanban/js/view.js
+2 -1
View File
@@ -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');
}