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

Merge branch 'spring/170_hufangzhou_43904' into 'sprint/170'

Browse Source 
* Code for task #43904.

See merge request easycorp/zentaopms!351
This commit is contained in:
李玉春
2021-11-08 10:47:38 +00:00
parent b778d246c2 d10834ab9f
commit 5f372cea88
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/filter.php
+2 -2
View File
@@ -169,7 +169,7 @@ $filter->my->contribute->cookie['pagerMyDoc'] = 'int';
$filter->bug->batchcreate->cookie['preBranch'] = 'reg::word';
$filter->bug->browse->cookie['bugModule'] = 'int';
$filter->bug->browse->cookie['bugBranch'] = 'int';
$filter->bug->browse->cookie['treeBranch'] = 'int';
$filter->bug->browse->cookie['treeBranch'] = 'reg::word';
$filter->bug->browse->cookie['preBranch'] = 'reg::word';
$filter->bug->browse->cookie['qaBugOrder'] = 'reg::orderBy';
$filter->bug->browse->cookie['windowWidth'] = 'int';
@@ -209,7 +209,7 @@ $filter->product->browse->cookie['preProductID'] = 'int';
$filter->product->browse->cookie['productStoryOrder'] = 'reg::orderBy';
$filter->product->browse->cookie['storyModule'] = 'int';
$filter->product->browse->cookie['storyBranch'] = 'int';
$filter->product->browse->cookie['treeBranch'] = 'int';
$filter->product->browse->cookie['treeBranch'] = 'reg::word';
$filter->product->default->cookie['lastProduct'] = 'int';
$filter->product->default->cookie['preProductID'] = 'int';
$filter->product->index->cookie['preBranch'] = 'reg::word';
module/product/control.php
+3 -3
View File
@@ -158,7 +158,7 @@ class product extends control
if($this->app->tab == '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 == '') setcookie('treeBranch', $branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
}
if($browseType == 'bybranch') setcookie('storyBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
@@ -180,12 +180,12 @@ class product extends control
$createModuleLink = $storyType == 'story' ? 'createStoryLink' : 'createRequirementLink';
if($browseType == '')
{
setcookie('treeBranch', (int)$branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
setcookie('treeBranch', $branch, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
$browseType = 'unclosed';
}
else
{
$branch = (int)$this->cookie->treeBranch;
$branch = $this->cookie->treeBranch;
}
/* If in project story and not chose product, get project story mdoules. */
module/story/control.php
+1 -1
View File
@@ -165,7 +165,7 @@ class story extends control
{
setcookie('storyModule', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
$branchID = $this->post->branch ? $this->post->branch : $branch;
$response['locate'] = $this->createLink('product', 'browse', "productID=$productID&branch=$branchID&browseType=unclosed&param=0&type=$type&orderBy=id_desc");
$response['locate'] = $this->createLink('product', 'browse', "productID=$productID&branch=$branchID&browseType=&param=0&type=$type&orderBy=id_desc");
if($this->session->storyList and $this->app->tab != 'product') $response['locate'] = $this->session->storyList;
}
else