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

* Fix bug #23374.

Browse Source
This commit is contained in:
tanghucheng
2022-06-09 14:54:54 +08:00
parent c4765a8431
commit 415542746b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/model.php
+1
View File
@@ -2986,6 +2986,7 @@ class storyModel extends model
->beginIF($moduleIdList)->andWhere('t2.module')->in($moduleIdList)->fi()
->beginIF($status == 'unclosed')->andWhere('t2.status')->ne('closed')->fi()
->beginIF($status == 'review')->andWhere('t2.status')->in('draft,changed')->fi()
->beginIF($status == 'active')->andWhere('t2.status')->eq('active')->fi()
->orderBy('t1.`order` desc, t1.`story` desc')
->fetchAll('id');
return empty($stories) ? array() : $this->formatStories($stories, $type);
module/task/control.php
+2 -2
View File
@@ -240,7 +240,7 @@ class task extends control
if(!isset($moduleOptionMenu[$task->module])) $task->module = 0;
}
$stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', '', 'full', 'unclosed');
$stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', '', 'full', 'active');
/* Get block id of assinge to me. */
$blockID = 0;
@@ -537,7 +537,7 @@ class task extends control
$this->view->title = $this->lang->task->edit . 'TASK' . $this->lang->colon . $this->view->task->name;
$this->view->position[] = $this->lang->task->common;
$this->view->position[] = $this->lang->task->edit;
$this->view->stories = $this->story->getExecutionStoryPairs($this->view->execution->id);
$this->view->stories = $this->story->getExecutionStoryPairs($this->view->execution->id, 0, 'all', '', 'full', 'active');
$this->view->tasks = $tasks;
$this->view->users = $this->loadModel('user')->getPairs('nodeleted', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}");
$this->view->showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';