Merge branch 'master_xieqiyu_21334' into 'master'
* Fix bug#21334. See merge request easycorp/zentaopms!2729
This commit is contained in:
@@ -1270,6 +1270,7 @@ class executionModel extends model
|
||||
$executions = $this->dao->select('*')->from(TABLE_EXECUTION)
|
||||
->where('type')->in('stage,sprint,kanban')
|
||||
->andWhere('deleted')->eq('0')
|
||||
->andWhere('vision')->eq($this->config->vision)
|
||||
->beginIF($projectID)->andWhere('project')->eq((int)$projectID)->fi()
|
||||
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
|
||||
->beginIF($status == 'undone')->andWhere('status')->notIN('done,closed')->fi()
|
||||
|
||||
Reference in New Issue
Block a user