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

Merge branch 'sprint/174_tianshujie_16968' into 'master'

Browse Source 
Sprint/174 tianshujie 16968

See merge request easycorp/zentaopms!748
This commit is contained in:
李玉春
2021-12-02 07:42:14 +00:00
parent db897d851d 9e9dcf653d
commit b26673eb9b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/base/front/front.class.php
+2 -2
View File
@@ -491,7 +491,7 @@ class baseHTML
$gobackLink = "<a href='javascript:history.go(-1)' class='btn btn-back $class' $misc>{$label}</a>";
$tab = $_COOKIE['tab'];
$referer = isset($_SERVER['HTTP_REFERER']) ? strtolower($_SERVER['HTTP_REFERER']) : '';
$referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
$refererParts = parse_url($referer);
if($config->requestType == 'PATH_INFO' and empty($refererParts)) return $gobackLink;
@@ -504,7 +504,7 @@ class baseHTML
$gobackLink = isset($gobackList[$tab]) ? $gobackList[$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)(&|-|\.)?/", $refererLink))
if(!preg_match("/(m=|\/)(index|search|$currentModule)(&f=|-)(index|buildquery|$currentMethod)(&|-|\.)?/", strtolower($refererLink)))
{
$gobackList[$tab] = $referer;
$gobackLink = $referer;
module/product/model.php
+1 -1
View File
@@ -1240,7 +1240,7 @@ class productModel extends model
$executionPairs = $executionPairs + $execution->children;
continue;
}
if($this->config->systemMode == 'new') $executionPairs[$execution->id] = $projectPairs[$execution->project] . '/' . $execution->name;
if($this->config->systemMode == 'new' and isset($projectPairs[$execution->project])) $executionPairs[$execution->id] = $projectPairs[$execution->project] . '/' . $execution->name;
if($this->config->systemMode == 'classic') $executionPairs[$execution->id] = $execution->name;
}