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

Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
holan20180123
2021-03-09 15:15:52 +08:00
parent 032b89aaed fb89b18fd9
commit f0db2b971d
7 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+3 -4
View File
@@ -61,7 +61,6 @@ class execution extends control
{
if($locate == 'yes') $this->locate($this->createLink('execution', 'task'));
if($this->app->viewType != 'mhtml') unset($this->lang->execution->menu->index);
$this->commonAction($executionID);
if(common::hasPriv('execution', 'create')) $this->lang->TRActions = html::a($this->createLink('execution', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->execution->create, '', "class='btn btn-primary'");
@@ -2237,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. */