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

* code for task #69715.

Browse Source
This commit is contained in:
wangyidong
2022-09-21 09:19:47 +08:00
parent 8be950d693
commit 42e85921d6
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+2 -2
View File
@@ -3123,11 +3123,11 @@ class execution extends control
}
/* Get projects, executions and products. */
$object = $this->project->getByID($objectID, $this->app->tab == 'project' ? 'project' : 'sprint,stage,kanban');
$object = $this->project->getByID($objectID, 'project,sprint,stage,kanban');
$products = $this->product->getProducts($objectID);
$queryID = ($browseType == 'bySearch') ? (int)$param : 0;
$browseLink = $this->session->executionStoryList;
if($this->app->tab == 'project') $browseLink = $this->createLink('projectstory', 'story', "objectID=$objectID");
if($this->app->tab == 'project' and empty($object->noSprint)) $browseLink = $this->createLink('projectstory', 'story', "objectID=$objectID");
$this->session->set('storyList', $this->app->getURI(true), $this->app->tab); // Save session.
module/execution/view/story.html.php
+4 -4
View File
@@ -69,7 +69,7 @@
</div>
<?php endif;?>
<?php
common::printLink('story', 'export', "productID=$productID&orderBy=id_desc&executionID=$execution->id", "<i class='icon icon-export muted'></i> " . $lang->story->export, '', "class='btn btn-link export iframe' data-app='execution'");
common::printLink('story', 'export', "productID=$productID&orderBy=id_desc&executionID=$execution->id", "<i class='icon icon-export muted'></i> " . $lang->story->export, '', "class='btn btn-link export iframe'");
if(common::canModify('execution', $execution))
{
@@ -96,14 +96,14 @@
$hidden = empty($buttonLink) ? 'hidden' : '';
echo "<div class='btn-group dropdown' title='{$buttonTitle}'>";
echo html::a($buttonLink, "<i class='icon icon-plus'></i> $buttonTitle", '', "class='btn btn-secondary $hidden' data-app='execution'");
echo html::a($buttonLink, "<i class='icon icon-plus'></i> $buttonTitle", '', "class='btn btn-secondary $hidden'");
if($common::hasPriv('story', 'create') and common::hasPriv('story', 'batchCreate'))
{
if(!($isAllProduct and count($products) > 1)) echo "<button type='button' class='btn btn-secondary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
echo "<ul class='dropdown-menu pull-right'>";
echo '<li>' . html::a($createStoryLink, $lang->story->create, '', "data-app='execution'") . '</li>';
echo '<li>' . html::a($batchCreateLink, $lang->story->batchCreate, '', "data-app='execution'") . '</li>';
echo '<li>' . html::a($createStoryLink, $lang->story->create) . '</li>';
echo '<li>' . html::a($batchCreateLink, $lang->story->batchCreate) . '</li>';
echo '</ul>';
}
module/project/model.php
+3
View File
@@ -2519,6 +2519,7 @@ class projectModel extends model
}
if(empty($projectID) or empty($executionID)) return;
$this->session->set('project', $projectID, $this->app->tab);
$this->app->tab = 'project';
$_COOKIE['tab'] = 'project';
@@ -2552,7 +2553,9 @@ class projectModel extends model
}
}
$this->config->resetNavGroup['execution'] = 'project';
$this->config->resetNavGroup[$moduleName] = 'project';
$this->config->projectMode = 'noSprint';
/* If objectID is set, cannot use homeMenu. */
unset($this->lang->$navGroup->homeMenu);
module/story/model.php
+1 -1
View File
@@ -4580,7 +4580,7 @@ class storyModel extends model
$storyLink = helper::createLink('story', 'view', "storyID=$story->id&version=0&param=0&storyType=$story->type");
$canView = common::hasPriv($story->type, 'view', null, "storyType=$story->type");
if($tab == 'project')
if($tab == 'project' and empty($this->config->projectMode))
{
$storyLink = helper::createLink('projectstory', 'view', "storyID=$story->id");
$canView = common::hasPriv('projectstory', 'view');
module/task/control.php
+1 -1
View File
@@ -354,7 +354,7 @@ class task extends control
{
$taskLink = $this->createLink('my', 'work', 'mode=task');
}
elseif($this->app->tab == 'project')
elseif($this->app->tab == 'project' and empty($execution->noSprint))
{
$taskLink = $this->createLink('project', 'execution', "browseType=all&projectID={$execution->project}");
}