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

* Finish task#9101. Change PRJEdit return.

Browse Source
This commit is contained in:
qiyu-xie
2021-01-25 13:55:00 +08:00
parent eb6de62f11
commit 5e1b253d58
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
-1
View File
@@ -468,7 +468,6 @@ class my extends control
$this->app->session->set('programList', $this->app->getURI(true));
$this->app->session->set('PRJBrowse', $this->app->getURI(true));
$this->app->session->set('PRJEdit', $this->app->getURI(true));
$this->app->session->set('whitelist', $this->app->getURI(true));
$this->app->session->set('PRJManageProducts', $this->app->getURI(true));
module/program/control.php
+5 -5
View File
@@ -63,7 +63,6 @@ class program extends control
if(common::hasPriv('program', 'pgmcreate')) $this->lang->pageActions = html::a($this->createLink('program', 'pgmcreate'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->program->PGMCreate, '', "class='btn btn-secondary'");
$this->app->session->set('programList', $this->app->getURI(true));
$this->app->session->set('PRJEdit', $this->app->getURI(true));
$this->app->session->set('whitelist', $this->app->getURI(true));
$this->app->session->set('PRJManageProducts', $this->app->getURI(true));
@@ -416,7 +415,7 @@ class program extends control
if(!$programID) $this->locate($this->createLink('program', 'PGMbrowse'));
setCookie("lastPGM", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
$this->app->session->set('PRJEdit', $this->app->getURI(true));
$this->app->session->set('PGMProject', $this->app->getURI(true));
$this->app->session->set('whitelist', $this->app->getURI(true));
$this->app->session->set('PRJManageProducts', $this->app->getURI(true));
@@ -798,7 +797,6 @@ class program extends control
$this->lang->program->menu = $this->lang->PRJ->menu;
$this->lang->program->mainMenuAction = html::a('javascript:history.go(-1);', '<i class="icon icon-back"></i> ' . $this->lang->goback, '', "class='btn btn-link'");
$this->app->session->set('PRJBrowse', $this->app->getURI(true));
$this->app->session->set('PRJEdit', $this->app->getURI(true));
$this->app->session->set('whitelist', $this->app->getURI(true));
$this->app->session->set('PRJManageProducts', $this->app->getURI(true));
$this->loadModel('datatable');
@@ -994,7 +992,9 @@ class program extends control
$this->action->logHistory($actionID, $changes);
}
$locateLink = $this->session->PRJEdit ? $this->session->PRJEdit : inLink('PRJView', "projectID=$projectID");
$locateLink = $this->session->PRJBrowse ? $this->session->PRJBrowse : inLink('PRJView', "projectID=$projectID");
if($from == 'pgmbrowse') $locateLink = inLink('PGMBrowse');
if($from == 'pgmproject') $locateLink = $this->session->PGMProject ? $this->session->PGMProject : inLink('PGMProject', "programID=$programID");
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
}
@@ -1066,7 +1066,7 @@ class program extends control
$moduleIndex = array_search('program', $this->lang->noMenuModule);
if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]);
$this->app->session->set('PRJEdit', $this->app->getURI(true));
$this->app->session->set('PRJBrowse', $this->app->getURI(true));
$products = $this->loadModel('product')->getProductsByProject($projectID);;
$linkedBranches = array();