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

* Fix bug 3718.

Browse Source
This commit is contained in:
holan20180123
2020-12-02 17:04:20 +08:00
parent b5e407a244
commit 05dca799a0
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+3 -2
View File
@@ -834,7 +834,7 @@ class projectModel extends model
* Get execution pairs.
*
* @param int $projectID
* @param string $type all|sprint|stage|kanban
* @param string $type all|execution|sprint|stage|kanban
* @param string $mode all|noclosed or empty
* @access public
* @return array
@@ -850,7 +850,8 @@ class projectModel extends model
$executions = $this->dao->select('*, IF(INSTR(" done,closed", status) < 2, 0, 1) AS isDone')->from(TABLE_EXECUTION)
->where('deleted')->eq(0)
->beginIF($projectID)->andWhere('project')->eq($projectID)->fi()
->beginIF($type != 'all')->andWhere('type')->eq($type)->fi()
->beginIF(!$projectID and $type == 'execution')->andWhere('project')->gt(0)->fi()
->beginIF($type != 'all' and $type != 'execution')->andWhere('type')->eq($type)->fi()
->beginIF(strpos($mode, 'withdelete') === false)->andWhere('deleted')->eq(0)->fi()
->beginIF(!$this->app->user->admin and strpos($mode, 'all') === false)->andWhere('id')->in($this->app->user->view->sprints)->fi()
->orderBy($orderBy)
module/todo/control.php
+2 -2
View File
@@ -376,8 +376,8 @@ class todo extends control
$this->view->users = $this->user->getPairs('noletter');
$this->view->actions = $this->loadModel('action')->getList('todo', $todoID);
$this->view->from = $from;
$this->view->projects = $this->loadModel('project')->getExecutionPairs($this->session->PRJ);
$this->view->products = $this->loadModel('product')->getPairs('', $this->session->PRJ);
$this->view->projects = $this->loadModel('project')->getExecutionPairs(0, 'execution');
$this->view->products = $this->loadModel('product')->getPairs();
$this->display();
}