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

* Adjust session.

Browse Source
This commit is contained in:
holan20180123
2021-03-24 16:43:54 +08:00
parent c24d011380
commit e69671ec32
3 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+21 -22
View File
@@ -896,28 +896,27 @@ class my extends control
{
/* Save session. */
$uri = $this->app->getURI(true);
$this->session->set('productList', $uri );
$this->session->set('storyList', $uri );
$this->session->set('designList', $uri );
$this->session->set('productPlanList', $uri );
$this->session->set('releaseList', $uri );
$this->session->set('programList', $uri );
$this->session->set('projectList', $uri );
$this->session->set('executionList', $uri );
$this->session->set('taskList', $uri );
$this->session->set('buildList', $uri );
$this->session->set('bugList', $uri );
$this->session->set('caseList', $uri );
$this->session->set('caselibList', $uri );
$this->session->set('testsuiteList', $uri );
$this->session->set('testtaskList', $uri );
$this->session->set('reportList', $uri );
$this->session->set('docList', $uri );
$this->session->set('todoList', $uri );
$this->session->set('riskList', $uri );
$this->session->set('issueList', $uri );
$this->session->set('userList', $uri );
$this->session->set('stakeholderList', $uri );
$this->session->set('productList', $uri, 'product');
$this->session->set('storyList', $uri, 'product');
$this->session->set('designList', $uri, 'project');
$this->session->set('productPlanList', $uri, 'product');
$this->session->set('releaseList', $uri, 'product');
$this->session->set('programList', $uri, 'program');
$this->session->set('projectList', $uri, 'project');
$this->session->set('executionList', $uri, 'execution');
$this->session->set('taskList', $uri, 'execution');
$this->session->set('buildList', $uri, 'execution');
$this->session->set('bugList', $uri, 'qa');
$this->session->set('caseList', $uri, 'qa');
$this->session->set('caselibList', $uri, 'qa');
$this->session->set('testsuiteList', $uri, 'qa');
$this->session->set('testtaskList', $uri, 'qa');
$this->session->set('reportList', $uri, 'qa');
$this->session->set('docList', $uri, 'doc');
$this->session->set('todoList', $uri, 'my');
$this->session->set('riskList', $uri, 'project');
$this->session->set('issueList', $uri, 'project');
$this->session->set('stakeholderList', $uri, 'project');
/* Set the pager. */
$this->app->loadClass('pager', $static = true);
module/personnel/control.php
+2 -2
View File
@@ -109,7 +109,7 @@ class personnel extends control
/* Load lang and set session. */
$this->app->loadLang('user');
$this->app->session->set('whitelistBrowse', $this->app->getURI(true));
$this->app->session->set('whitelistList', $this->app->getURI(true), $this->app->openApp);
/* Load pager. */
$this->app->loadClass('pager', true);
@@ -165,7 +165,7 @@ class personnel extends control
$this->personnel->addWhitelist($objectType, $objectID);
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => $this->getError()));
$locateLink = $this->session->whitelistBrowse ? $this->session->whitelistBrowse : $this->createLink($module, 'whitelist', "objectID=$objectID");
$locateLink = $this->session->whitelistList ? $this->session->whitelistList : $this->createLink($module, 'whitelist', "objectID=$objectID");
$openApp = $module == 'program' ? ($from == 'project' || $from == 'my' ? '#open=project' : '#open=program') : '';
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink . $openApp));
}
module/personnel/view/addwhitelist.html.php
+1 -1
View File
@@ -82,7 +82,7 @@
<tr>
<td colspan='6' class='text-left form-actions'>
<?php echo html::submitButton(); ?>
<?php $gobackURL = $this->session->whitelistBrowse;?>
<?php $gobackURL = $this->session->whitelistList;?>
<?php $dataGroup = $module == 'program' ? ($from == 'project' || $from == 'my' ? "data-group='project'" : "data-group='program'") : '';?>
<?php echo empty($gobackURL) ? html::backButton() : html::a($gobackURL, $lang->goback, '', "class='btn btn-back btn-wide' $dataGroup");?>
</td>