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

* Modify the back link jump problem.

Browse Source
This commit is contained in:
tianshujie
2021-08-27 10:30:20 +08:00
parent 82c3d83ce4
commit 3c24fec3c2
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+18 -4
View File
@@ -274,7 +274,13 @@ class my extends control
public function task($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Save session. */
if($this->app->viewType != 'json') $this->session->set('taskList', $this->app->getURI(true), 'execution');
if($this->app->viewType != 'json')
{
$uri = $this->app->getURI(true);
$this->session->set('taskList', $uri, 'execution');
$this->session->set('projectList', $uri, 'project');
$this->session->set('executionList', $uri, 'execution');
}
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -398,7 +404,12 @@ class my extends control
$pager = pager::init($recTotal, $recPerPage, $pageID);
/* Save session. */
if($this->app->viewType != 'json') $this->session->set('testtaskList', $this->app->getURI(true), 'qa');
if($this->app->viewType != 'json')
{
$uri = $this->app->getURI(true);
$this->session->set('testtaskList', $uri, 'qa');
$this->session->set('buildList', $uri, 'execution');
}
$this->app->loadLang('testcase');
@@ -528,8 +539,9 @@ class my extends control
$this->loadModel('program');
$this->app->loadLang('project');
$this->app->session->set('programList', $this->app->getURI(true), 'program');
$this->app->session->set('projectList', $this->app->getURI(true), 'my');
$uri = $this->app->getURI(true);
$this->app->session->set('programList', $uri, 'program');
$this->app->session->set('projectList', $uri, 'my');
/* Set the pager. */
$this->app->loadClass('pager', $static = true);
@@ -570,6 +582,8 @@ class my extends control
$this->app->loadLang('project');
$this->app->loadLang('execution');
$this->app->session->set('projectList', $this->app->getURI(true), 'project');
/* Set the pager. */
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
module/todo/control.php
+8 -5
View File
@@ -368,11 +368,14 @@ class todo extends control
if(!$todo) die(js::error($this->lang->notFound) . js::locate('back'));
/* Save the session. */
$uri = $this->app->getURI(true);
$this->session->set('bugList', $uri, 'qa');
$this->session->set('taskList', $uri, 'execution');
$this->session->set('storyList', $uri, 'product');
$this->session->set('testtaskList', $uri, 'qa');
if(!isonlybody())
{
$uri = $this->app->getURI(true);
$this->session->set('bugList', $uri, 'qa');
$this->session->set('taskList', $uri, 'execution');
$this->session->set('storyList', $uri, 'product');
$this->session->set('testtaskList', $uri, 'qa');
}
/* Fix bug #936. */
if($this->app->user->account != $todo->account and !common::hasPriv('company', 'index'))