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

* Finish task #58575 #58602.

Browse Source
This commit is contained in:
zhouxudong
2022-06-28 00:49:54 +00:00
parent 6314aad2e3
commit d8acac2813
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+9 -2
View File
@@ -2913,7 +2913,14 @@ class execution extends control
/* Get projects, executions and products. */
$object = $this->project->getByID($objectID, $this->app->tab == 'project' ? 'project' : 'sprint,stage,kanban');
$products = $this->product->getProducts($objectID);
$browseLink = $this->createLink($this->app->tab == 'project' ? 'projectstory' : 'execution', 'story', "objectID=$objectID");
if($this->app->tab == 'project')
{
$browseLink = $this->createLink('projectstory', 'story', "objectID=$objectID");
}
else
{
$browseLink = $this->session->executionStoryList;
}
$queryID = ($browseType == 'bySearch') ? (int)$param : 0;
$this->session->set('storyList', $this->app->getURI(true), $this->app->tab); // Save session.
@@ -3037,7 +3044,7 @@ class execution extends control
$this->view->modules = $modules;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->branchGroups = $branchGroups;
$this->view->browseLink = $this->session->executionStoryList;
$this->view->browseLink = $browseLink;
$this->display();
}
module/execution/view/linkstory.html.php
+1 -1
View File
@@ -20,7 +20,7 @@
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->execution->linkStory;?></span></span>
</div>
<div class='btn-toolbar pull-right'>
<?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
<?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-primary'");?>
</div>
</div>
<div id="mainContent">