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

* Finish task#8970. Change to use session to record URL.

Browse Source
This commit is contained in:
qiyu-xie
2021-01-20 09:27:43 +08:00
parent c9046ede6d
commit df01cbe76a
6 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+1
View File
@@ -468,6 +468,7 @@ 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('whitelist', $this->app->getURI(true));
/* Set the pager. */
$this->app->loadClass('pager', $static = true);
module/my/view/project.html.php
+2 -2
View File
@@ -77,14 +77,14 @@
<?php if($project->status != 'closed') common::printIcon('program', 'PRJActivate', "projectID=$project->id", $project, 'list', 'magic', '', 'iframe', true);?>
</ul>
</div>
<?php common::printIcon('program', 'PRJEdit', "projectID=$project->id&programID=$project->parent", $project, 'list', 'edit', '', '', false, "data-group='project'");?>
<?php common::printIcon('program', 'PRJEdit', "projectID=$project->id&programID=$project->parent", $project, 'list', 'edit', '', '', false, "data-group='project'");?>
<?php common::printIcon('program', 'PRJManageMembers', "projectID=$project->id", $project, 'list', 'group', '', '', false, "data-group='project'");?>
<?php common::printIcon('program', 'PRJGroup', "projectID=$project->id", $project, 'list', 'lock', '', '', false, "data-group='project'");?>
<div class='btn-group'>
<button type='button' class='btn dropdown-toggle' data-toggle='dropdown' title="<?php echo $this->lang->more;?>"><i class='icon-more-alt'></i></button>
<ul class='dropdown-menu pull-right text-center' role='menu'>
<?php common::printIcon('program', 'PRJManageProducts', "projectID=$project->id", $project, 'list', 'link', '', '', false, "data-group='project'");?>
<?php common::printIcon('program', 'PRJWhitelist', "projectID=$project->id", $project, 'list', 'shield-check', '', '', false, "data-group='project'");?>
<?php common::printIcon('program', 'PRJWhitelist', "projectID=$project->id&programID=$project->parent&module=program&from=my", $project, 'list', 'shield-check', '', '', false, "data-group='project'");?>
<?php if(common::hasPriv('program','PRJDelete')) echo html::a($this->createLink("program", "PRJDelete", "projectID=$project->id"), "<i class='icon-trash'></i>", 'hiddenwin', "class='btn' title='{$this->lang->program->PRJDelete}'");?>
</ul>
</div>
module/personnel/control.php
+2 -13
View File
@@ -114,11 +114,6 @@ class personnel extends control
$this->app->loadClass('pager', true);
$pager = pager::init($recTotal, $recPerPage, $pageID);
/* Set back link. */
if($from == 'pgmbrowse') $goback = $this->createLink('program', 'PGMBrowse');
if($from == 'pgmproject') $goback = $this->createLink('program', 'PGMProject', "programID=$programID");
if($from == 'PRJ') $goback = $this->createLink('program', 'PRJBrowse');
$this->view->title = $this->lang->personnel->whitelist;
$this->view->position[] = $this->lang->personnel->whitelist;
@@ -127,7 +122,6 @@ class personnel extends control
$this->view->whitelist = $this->personnel->getWhitelist($objectID, $objectType, $orderBy, $pager);
$this->view->depts = $this->loadModel('dept')->getOptionMenu();
$this->view->module = $module;
$this->view->goback = isset($goback) ? $goback : '';
$this->view->programID = $programID;
$this->view->from = $from;
@@ -156,13 +150,8 @@ class personnel extends control
$this->personnel->addWhitelist($objectType, $objectID);
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => $this->getError()));
$locateLink = $this->createLink($module, 'whitelist', "objectID=$objectID");
if($module == 'program')
{
$openModule = $from == 'PRJ' ? 'project' : 'program';
$locateLink = $this->createLink('program', 'PRJWhitelist', "objectID=$objectID&programID=$programID&module=$module&from=$from") . "#open=$openModule";
}
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locateLink));
$openModule = $module == 'program' ? ($from == 'PRJ' || $from == 'my' ? '#open=project' : '#open=program') : '';
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->session->whitelistBrowse . $openModule));
}
$this->loadModel('dept');
module/personnel/view/addwhitelist.html.php
+1 -1
View File
@@ -84,7 +84,7 @@
<td colspan='6' class='text-left form-actions'>
<?php echo html::submitButton(); ?>
<?php $gobackURL = $this->session->whitelistBrowse;?>
<?php $dataGroup = $module == 'program' ? ($from == 'PRJ' ? "data-group='project'" : "data-group='program'") : '';?>
<?php $dataGroup = $module == 'program' ? ($from == 'PRJ' || $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>
</tr>
module/personnel/view/whitelist.html.php
+2 -3
View File
@@ -12,17 +12,16 @@
?>
<?php include '../../common/view/header.html.php';?>
<div id="mainMenu" class="clearfix">
<?php $openModule = $module == 'program' ? ($from == 'PRJ' || $from == 'my' ? "data-group='project'" : "data-group='program'") : '';?>
<div class="btn-toolbar pull-left">
<?php if($module == 'program') echo html::a($this->session->whitelist, $lang->goback, '', 'class="btn btn-secondary"');?>
<?php $moduleMethod = $module == 'program' ? 'PRJWhitelist' : 'whitelist';?>
<?php $vars = $module == 'program' ? "objectID=$objectID&programID=$programID&module=$module&from=$from" : "objectID=$objectID";?>
<?php $openModule = $module == 'program' ? ($from == 'PRJ' ? "data-group='project'" : "data-group='program'") : '';?>
<?php if($module == 'program') echo html::a($goback, $lang->goback, '', 'class="btn btn-secondary"');?>
<?php echo html::a($this->createLink($module, $moduleMethod, $vars), '<span class="text">' . $lang->personnel->whitelist . '</span>', '', "class='btn btn-link btn-active-text' $openModule");?>
</div>
<div class="btn-toolbar pull-right">
<?php $moduleMethod = $module == 'program' ? 'PRJAddWhitelist' : 'addWhitelist';?>
<?php $vars = $module == 'program' ? "objectID=$objectID&deptID=0&programID=$programID&from=$from" : "objectID=$objectID";?>
<?php $openModule = $module == 'program' ? ($from == 'PRJ' ? "data-group='project'" : "data-group='program'") : '';?>
<?php common::printLink($module, $moduleMethod, $vars, "<i class='icon icon-plus'></i>" . $lang->personnel->addWhitelist, '', "class='btn btn-primary' $openModule");?>
</div>
</div>
module/program/control.php
+4
View File
@@ -66,6 +66,7 @@ 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('whitelist', $this->app->getURI(true));
$programType = $this->cookie->programType ? $this->cookie->programType : 'bylist';
@@ -417,6 +418,8 @@ 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('whitelist', $this->app->getURI(true));
$this->lang->navGroup->program = 'program';
$this->lang->program->switcherMenu = $this->program->getPGMSwitcher($programID, true);
$this->lang->program->mainMenuAction = $this->program->getPGMMainAction();
@@ -794,6 +797,7 @@ class program extends control
{
$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('whitelist', $this->app->getURI(true));
$this->loadModel('datatable');
/* Load pager and get tasks. */