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

Merge branch 'sprint/208_tianshujie_fixbug' into 'master'

Browse Source 
Sprint/208 tianshujie fixbug

See merge request easycorp/zentaopms!4259
This commit is contained in:
王怡栋
2022-06-30 05:17:58 +00:00
parent baa7851b95 7528cdfdcf
commit 531a112d7d
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/base/front/front.class.php
-2
View File
@@ -501,8 +501,6 @@ class baseHTML
$gobackList = isset($_COOKIE['goback']) ? json_decode($_COOKIE['goback'], true) : array();
$gobackLink = isset($gobackList[$tab]) ? $gobackList[$tab] : '';
if(strpos($misc, 'data-app') === false) $misc .= " data-app='" . $tab . "'";
/* If the link of the referer is not the link of the current page or the link of the index, the cookie and gobackLink will be updated. */
if(!preg_match("/(m=|\/)(index|search|$currentModule)(&f=|-)(index|buildquery|$currentMethod)(&|-|\.)?/", strtolower($refererLink)))
{
module/product/control.php
+6 -6
View File
@@ -148,18 +148,18 @@ class product extends control
}
/* Set menu. */
if($this->app->tab == 'product')
if($this->app->tab == 'project')
{
$this->session->set('storyList', $this->app->getURI(true), 'project');
$this->loadModel('project')->setMenu($projectID);
}
else
{
$this->session->set('storyList', $this->app->getURI(true), 'product');
$this->session->set('productList', $this->app->getURI(true), 'product');
$this->product->setMenu($productID, $branch, 0, '', "storyType=$storyType");
}
if($this->app->tab == 'project')
{
$this->session->set('storyList', $this->app->getURI(true), 'project');
$this->loadModel('project')->setMenu($projectID);
}
/* Lower browse type. */
$browseType = strtolower($browseType);
module/story/model.php
+2 -1
View File
@@ -3892,7 +3892,8 @@ class storyModel extends model
$menu .= $this->buildMenu('story', 'close', $params, $story, $type, '', '', 'iframe', true);
$menu .= $this->buildMenu('story', 'edit', $params . "&from=$story->from", $story, $type);
if($story->type != 'requirement' and $this->config->vision != 'lite') $menu .= $this->buildMenu('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$params", $story, $type, 'sitemap', '', '', false, "data-app='qa'");
$tab = $this->app->tab == 'project' ? 'project' : 'qa';
if($story->type != 'requirement' and $this->config->vision != 'lite') $menu .= $this->buildMenu('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=&param=0&$params", $story, $type, 'sitemap', '', '', false, "data-app='$tab'");
if($this->app->rawModule != 'projectstory' OR $this->config->vision == 'lite')
{
module/task/model.php
+1 -1
View File
@@ -831,7 +831,7 @@ class taskModel extends model
$currentTask->consumed += (float)$member->consumed;
$currentTask->left += (float)$member->left;
}
if(empty($oldTask->team)) $currentTask->consumed += (float)$oldTask->consumed;
if(empty($oldTask->team) and isset($oldTask->consumed)) $currentTask->consumed += (float)$oldTask->consumed;
if(!empty($task))
{
module/task/view/view.html.php
+1 -1
View File
@@ -166,7 +166,7 @@
<?php endif;?>
<div class='main-actions'>
<div class="btn-toolbar">
<?php common::printBack($browseLink);?>
<?php echo html::a($browseLink, '<i class="icon icon-back icon-sm"></i> ' . $lang->goback, '', "class='btn btn-secondary'");?>
<?php if(!isonlybody()) echo "<div class='divider'></div>";?>
<?php $task->executionList = $execution;?>
<?php echo $this->task->buildOperateMenu($task, 'view');?>