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

*Fix bug #19959 #19963.

Browse Source
This commit is contained in:
孙华伟
2022-02-24 15:08:20 +08:00
parent af6e121c60
commit 890532c727
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
module/execution/control.php
View File

@@ -818,11 +818,8 @@ class execution extends control
if($param)
$this->session->set('executionStoryBrowseParam', $param);
a($param);
if(isset($_GET['param']))
$isAllProduct = $param;
else
$isAllProduct = $this->session->executionStoryBrowseParam;
if(isset($_GET['param'])) $isAllProduct = $param;
else $isAllProduct = $this->session->executionStoryBrowseParam;
/* Assign. */
$this->view->title = $title;
@@ -849,7 +846,7 @@ class execution extends control
$this->view->branchGroups = $branchGroups;
$this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
$this->view->showBranch = $showBranch;
a('param:'.$this->view->param.'products:'.count($products));
$this->display();
}

2
module/execution/view/story.html.php
View File

@@ -86,7 +86,7 @@
if($common::hasPriv('story', 'create') and common::hasPriv('story', 'batchCreate'))
{
if($isAllProject != 0 || count($products) == 1) echo "<button type='button' class='btn btn-secondary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>";
if($isAllProduct != 0 || 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>';

2
module/tree/model.php
View File

@@ -818,7 +818,7 @@ class treeModel extends model
$projectProductLink = helper::createLink('projectstory', 'story', "projectID=$rootID&productID=$id&branch=all");
$executionProductLink = helper::createLink('execution', 'story', "executionID=$rootID&ordery=&status=byProduct&praram=$id");
$link = $this->app->rawModule == 'projectstory' ? $projectProductLink : $executionProductLink;
if($productNum > 1) $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id'");
if($productNum > 1) $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id' title=$product");
/* tree menu. */
$tree = '';