- createLink('story', 'view', "story=$story->id", '', true), "#{$story->id} {$story->title}", '', 'class="title kanbaniframe" title="' . $story->title . '"');?>
+ createLink('execution', 'storyView', "story=$story->id", '', true), "#{$story->id} {$story->title}", '', 'class="title kanbaniframe" title="' . $story->title . '"');?>
story->priList, $story->pri);?>
story->statusList[$story->status];?>
diff --git a/module/execution/view/treestory.html.php b/module/execution/view/treestory.html.php
index 0f82be8180..c7aafbeae6 100644
--- a/module/execution/view/treestory.html.php
+++ b/module/execution/view/treestory.html.php
@@ -89,7 +89,7 @@
{
foreach($story->planTitle as $planID => $planTitle)
{
- if(!common::printLink('productplan', 'view', "planID=$planID", $planTitle)) echo $lanTitle;
+ if(!common::printLink('productplan', 'view', "planID=$planID", $planTitle)) echo $planTitle;
echo '
';
}
}
@@ -258,7 +258,7 @@
extraStories[$linkStoryID])) echo '
' . html::a($this->createLink('story', 'view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID]) . '';
+ if(isset($story->extraStories[$linkStoryID])) echo '' . html::a($this->createLink('execution', 'storyView', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID]) . '';
}
?>
@@ -276,7 +276,7 @@
extraStories[$childStoryID])) echo '' . html::a($this->createLink('story', 'view', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . '';
+ if(isset($story->extraStories[$childStoryID])) echo '' . html::a($this->createLink('execution', 'storyView', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . '';
}
?>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 32e10087ca..7c00e40205 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -769,6 +769,7 @@ $lang->resource->execution->whitelist = 'whitelist';
$lang->resource->execution->addWhitelist = 'addWhitelist';
$lang->resource->execution->unbindWhitelist = 'unbindWhitelist';
$lang->resource->execution->storyEstimate = 'storyEstimate';
+$lang->resource->execution->storyView = 'storyView';
if($config->systemMode == 'new') $lang->resource->execution->executionkanban = 'kanbanAction';
$lang->resource->execution->kanban = 'RDKanban';
//if($config->systemMode == 'classic') $lang->resource->project->list = 'list';
diff --git a/module/story/model.php b/module/story/model.php
index 4dbd940f30..3f77567870 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -4137,7 +4137,7 @@ class storyModel extends model
$canView = common::hasPriv($module, 'view');
$tab = $this->app->tab;
$executionID = empty($execution) ? $this->session->execution : $execution->id;
- $storyLink = $tab == 'execution' ? helper::createLink('story', 'view', "storyID=$story->id&version=$story->version¶m=$executionID") : helper::createLink($module, 'view', "storyID=$story->id");
+ $storyLink = $tab == 'execution' ? helper::createLink('execution', 'storyView', "storyID=$story->id") : helper::createLink($module, 'view', "storyID=$story->id");
$account = $this->app->user->account;
/* Check the product is closed. */
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index fa43cce231..c2a92ef17e 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -268,7 +268,7 @@
{
foreach($story->planTitle as $planID => $planTitle)
{
- if(!common::printLink('productplan', 'view', "planID=$planID", $planTitle, '', "data-app='product'")) echo $lanTitle;
+ if(!common::printLink('productplan', 'view', "planID=$planID", $planTitle, '', "data-app='product'")) echo $planTitle;
echo '
';
}
}
diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php
index 9393cd8ea1..3796adebe0 100644
--- a/module/task/view/view.html.php
+++ b/module/task/view/view.html.php
@@ -246,7 +246,7 @@
storyTitle) echo $lang->noData;
$class = isonlybody() ? 'showinonlybody' : 'iframe';
- if($task->storyTitle and !common::printLink('story', 'view', "storyID=$task->story", $task->storyTitle, '', "class=$class data-width='80%'", true, true)) echo $task->storyTitle;
+ if($task->storyTitle and !common::printLink('execution', 'storyView', "storyID=$task->story", $task->storyTitle, '', "class=$class data-width='80%'", true, true)) echo $task->storyTitle;
if($task->needConfirm)
{
echo "({$lang->story->changed} ";