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

* Finish task #36482 and fix bugs.

Browse Source
This commit is contained in:
Yagami
2021-03-09 14:58:08 +08:00
parent e87a149ff7
commit bd061f23dd
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+3 -3
View File
@@ -2236,15 +2236,15 @@ class execution extends control
$allStories = $this->story->getProductStories(array_keys($products), $branches, $moduleID = '0', $status = 'active', 'story', 'id_desc', $hasParent = false, '', $pager = null);
}
if($execution->execution != 0) $executionStories = $this->story->getStoryPairs($execution->execution);
if($execution->project != 0) $projectStories = $this->story->getExecutionStoryPairs($execution->project);
$executionStories = $this->story->getStoryPairs($executionID);
$executionStories = $this->story->getExecutionStoryPairs($executionID);
foreach($allStories as $id => $story)
{
if(isset($executionStories[$story->id])) unset($allStories[$id]);
if($story->parent < 0) unset($allStories[$id]);
if(!empty($executionStories) and !isset($executionStories[$story->id])) unset($allStories[$id]);
if(!empty($projectStories) and !isset($projectStories[$story->id])) unset($allStories[$id]);
}
/* Pager. */