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

Merge branch 'sprint/179_liumengyi_fixbug' into 'master'

Browse Source 
* Fix bug #17939.

See merge request easycorp/zentaopms!1146
This commit is contained in:
孙广明
2021-12-24 09:26:40 +00:00
parent 178e52b999 8425897a08
commit fead61e40a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+2 -2
View File
@@ -161,7 +161,7 @@ class kanban extends control
$this->view->users = $this->loadModel('user')->getPairs('noclosed|nodeleted');
$this->view->spaceID = $spaceID;
$this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs();
$this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs('noclosed');
$this->display();
}
@@ -189,7 +189,7 @@ class kanban extends control
}
$this->view->users = $this->loadModel('user')->getPairs('noclosed');
$this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs();
$this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs('noclosed');
$this->view->kanban = $this->kanban->getByID($kanbanID);
$this->display();
module/kanban/model.php
+1
View File
@@ -859,6 +859,7 @@ class kanbanModel extends model
->beginIF($browseType == 'my')->andWhere('owner')->eq($account)->fi()
->beginIF($browseType == 'other')->andWhere('owner')->ne($account)->fi()
->beginIF($browseType == 'closed')->andWhere('status')->eq('closed')->fi()
->beginIF($browseType == 'noclosed')->andWhere('status')->ne('closed')->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($spaceIdList)->fi()
->orderBy('id_desc')
->fetchPairs('id');