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

* Fix bug #10841.

Browse Source
This commit is contained in:
holan20180123
2021-05-11 10:43:56 +08:00
parent b712c10fbd
commit 5174ede18e
3 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
config/filter.php
View File

@@ -28,33 +28,34 @@ $filter->default->cookie['fingerprint'] = 'reg::word';
$filter->default->cookie['hideMenu'] = 'equal::true';
$filter->default->cookie['openApp'] = 'reg::word';
$filter->bug = new stdclass();
$filter->caselib = new stdclass();
$filter->doc = new stdclass();
$filter->product = new stdclass();
$filter->branch = new stdclass();
$filter->qa = new stdclass();
$filter->story = new stdclass();
$filter->task = new stdclass();
$filter->testcase = new stdclass();
$filter->program = new stdclass();
$filter->project = new stdclass();
$filter->testreport = new stdclass();
$filter->testsuite = new stdclass();
$filter->todo = new stdclass();
$filter->testtask = new stdclass();
$filter->upgrade = new stdclass();
$filter->sso = new stdclass();
$filter->misc = new stdclass();
$filter->mail = new stdclass();
$filter->user = new stdclass();
$filter->block = new stdclass();
$filter->file = new stdclass();
$filter->repo = new stdclass();
$filter->webhook = new stdclass();
$filter->git = new stdclass();
$filter->svn = new stdclass();
$filter->search = new stdclass();
$filter->bug = new stdclass();
$filter->caselib = new stdclass();
$filter->doc = new stdclass();
$filter->product = new stdclass();
$filter->branch = new stdclass();
$filter->qa = new stdclass();
$filter->story = new stdclass();
$filter->task = new stdclass();
$filter->testcase = new stdclass();
$filter->program = new stdclass();
$filter->project = new stdclass();
$filter->projectstory = new stdclass();
$filter->testreport = new stdclass();
$filter->testsuite = new stdclass();
$filter->todo = new stdclass();
$filter->testtask = new stdclass();
$filter->upgrade = new stdclass();
$filter->sso = new stdclass();
$filter->misc = new stdclass();
$filter->mail = new stdclass();
$filter->user = new stdclass();
$filter->block = new stdclass();
$filter->file = new stdclass();
$filter->repo = new stdclass();
$filter->webhook = new stdclass();
$filter->git = new stdclass();
$filter->svn = new stdclass();
$filter->search = new stdclass();
$filter->block->default = new stdclass();
$filter->block->main = new stdclass();
@@ -94,6 +95,7 @@ $filter->project->browse = new stdclass();
$filter->project->story = new stdclass();
$filter->project->export = new stdclass();
$filter->project->task = new stdclass();
$filter->projectstory->story = new stdclass();
$filter->qa->default = new stdclass();
$filter->story->create = new stdclass();
$filter->story->export = new stdclass();
@@ -194,6 +196,8 @@ $filter->project->task->cookie['projectTaskOrder'] = 'reg::orderBy';
$filter->project->task->cookie['windowWidth'] = 'int';
$filter->project->export->cookie['checkedItem'] = 'reg::checked';
$filter->projectstory->story->cookie['storyModuleParam'] = 'int';
$filter->qa->default->cookie['lastProduct'] = 'int';
$filter->qa->default->cookie['preBranch'] = 'int';
$filter->qa->default->cookie['preProductID'] = 'int';

4
module/product/control.php
View File

@@ -151,13 +151,15 @@ class product extends control
if($browseType == 'bymodule' or $browseType == '')
{
setcookie('storyModule', (int)$param, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
if($this->app->openApp == 'project') setcookie('storyModuleParam', (int)$param, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
$_COOKIE['storyBranch'] = 0;
setcookie('storyBranch', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
if($browseType == '') setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
}
if($browseType == 'bybranch') setcookie('storyBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
$moduleID = ($browseType == 'bymodule') ? (int)$param : (($browseType == 'bysearch' or $browseType == 'bybranch') ? 0 : ($this->cookie->storyModule ? $this->cookie->storyModule : 0));
$cookieModule = $this->app->openApp == 'project' ? $this->cookie->storyModuleParam : $this->cookie->storyModule;
$moduleID = ($browseType == 'bymodule') ? (int)$param : (($browseType == 'bysearch' or $browseType == 'bybranch') ? 0 : ($cookieModule ? $cookieModule : 0));
$queryID = ($browseType == 'bysearch') ? (int)$param : 0;
/* Set menu. The projectstory module does not execute. */

2
module/product/view/browse.html.php
View File

@@ -74,7 +74,7 @@ $projectIDParam = $isProjectStory ? "projectID=$projectID&" : '';
<?php
if($moduleID)
{
$removeLink = $browseType == 'bymodule' ? $this->createLink($this->app->rawModule, $this->app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=$browseType&param=0&storyType=$storyType&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("storyModule")';
$removeLink = $browseType == 'bymodule' ? $this->createLink($this->app->rawModule, $this->app->rawMethod, $projectIDParam . "productID=$productID&branch=$branch&browseType=$browseType&param=0&storyType=$storyType&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("storyModuleParam")';
echo html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted btn btn-link' style='padding-left: 0;'");
}
?>