* Fix bug#26779.
This commit is contained in:
@@ -1878,7 +1878,7 @@ class story extends control
|
||||
$storyGroup = array();
|
||||
foreach($stories as $story)
|
||||
{
|
||||
if(strpos('draft,closed', $story->status) !== false) continue;
|
||||
if(strpos('draft,reviewing,changing,closed', $story->status) !== false) continue;
|
||||
if(isset($storyGroup[$story->module])) continue;
|
||||
$storyGroup[$story->module] = $this->story->getExecutionStoryPairs($executionID, 0, 'all', $story->module, 'short', 'active');
|
||||
}
|
||||
|
||||
@@ -3010,7 +3010,7 @@ class storyModel extends model
|
||||
if($excludeStories) $storyQuery = $storyQuery . ' AND `id` NOT ' . helper::dbIN($excludeStories);
|
||||
if($this->app->moduleName == 'productplan') $storyQuery .= " AND `status` NOT IN ('closed') AND `parent` >= 0 ";
|
||||
$allBranch = "`branch` = 'all'";
|
||||
if($executionID != '')
|
||||
if(!empty($executionID))
|
||||
{
|
||||
$normalProducts = array();
|
||||
$branchProducts = array();
|
||||
|
||||
Reference in New Issue
Block a user