* Fix bug#46665.
This commit is contained in:
@@ -381,6 +381,7 @@ $options = array('storyTasks' => $storyTasks, 'storyBugs' => $storyBugs, 'storyC
|
||||
foreach($stories as $story)
|
||||
{
|
||||
$story->moduleID = $story->module;
|
||||
$story->from = 'execution';
|
||||
$data[] = $this->story->formatStoryForList($story, $options, $storyType);
|
||||
if(!isset($story->children)) continue;
|
||||
|
||||
|
||||
@@ -190,6 +190,7 @@ $options = array('storyTasks' => $storyTasks, 'storyBugs' => $storyBugs, 'storyC
|
||||
foreach($stories as $story)
|
||||
{
|
||||
$story->rawModule = $story->module;
|
||||
$story->from = $app->tab;
|
||||
$options['branches'] = zget($branchOptions, $story->product, array());
|
||||
$data[] = $this->story->formatStoryForList($story, $options, $storyType);
|
||||
if(!isset($story->children)) continue;
|
||||
|
||||
+3
-11
@@ -1744,17 +1744,9 @@ class storyZen extends story
|
||||
|
||||
if($from != 'execution') return helper::createLink('story', 'view', "storyID={$storyID}&version=0¶m=0&storyType={$storyType}");
|
||||
|
||||
$execution = $this->execution->getByID($this->session->execution);
|
||||
|
||||
$module = 'story';
|
||||
$method = 'view';
|
||||
$params = "storyID=$storyID&version=0¶m={$this->session->execution}&storyType=$storyType";
|
||||
if($execution->multiple)
|
||||
{
|
||||
$module = 'execution';
|
||||
$method = 'storyView';
|
||||
$params = "storyID=$storyID";
|
||||
}
|
||||
$module = 'execution';
|
||||
$method = 'storyView';
|
||||
$params = "storyID=$storyID";
|
||||
return helper::createLink($module, $method, $params);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user