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

* Fix bug.

Browse Source
This commit is contained in:
孙广明
2022-01-27 15:39:14 +08:00
parent 5ec7f42fb0
commit 827308efe2
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+2 -2
View File
@@ -737,12 +737,12 @@ class kanban extends control
$column = $this->kanban->getColumnById($columnID);
if($confirm == 'no')
{
$confirmLang = $column->parent ? $this->lang->kanbancolumn->confirmDeleteChild : $this->lang->kanbancolumn->confirmDelete;
$confirmLang = $column->parent > 0 ? $this->lang->kanbancolumn->confirmDeleteChild : $this->lang->kanbancolumn->confirmDelete;
die(js::confirm($confirmLang, $this->createLink('kanban', 'deleteColumn', "columnID=$columnID&confirm=yes")));
}
else
{
if($column->parent) $this->kanban->processCards($column);
if($column->parent > 0) $this->kanban->processCards($column);
$this->dao->delete()->from(TABLE_KANBANCOLUMN)->where('id')->eq($columnID)->exec();
module/kanban/model.php
+2 -1
View File
@@ -3238,6 +3238,7 @@ class kanbanModel extends model
->where('t1.id')->eq($columnID)
->fetch();
if(empty($column)) return false;
if($column->parent > 0) $column->parentName = $this->dao->findById($column->parent)->from(TABLE_KANBANCOLUMN)->fetch('name');
return $column;
@@ -3500,7 +3501,7 @@ class kanbanModel extends model
if($object->parent > 0)
{
$parent = $this->getColumnByID($object->parent);
if($parent->deleted == '1' || $parent->archived == '1') return false;
if(!empty($parent) and $parent->deleted == '1' || $parent->archived == '1') return false;
}
return $object->archived == '1';
case 'archivecolumn' :