From 7de8e1fd890bff601faf1f05c551044f25b2dcb3 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Mon, 25 Jan 2021 15:05:28 +0800
Subject: [PATCH] * Finish task#9101. Change whitelist return.

---
 module/my/control.php                    | 1 -
 module/personnel/control.php             | 6 ++++++
 module/personnel/view/whitelist.html.php | 2 +-
 module/program/control.php               | 3 ---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/my/control.php b/module/my/control.php
index 518acaca57..ae2bd2655b 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -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('whitelist', $this->app->getURI(true));
 
         /* Set the pager. */
         $this->app->loadClass('pager', $static = true);
diff --git a/module/personnel/control.php b/module/personnel/control.php
index 7be1cc0288..b055adbac7 100644
--- a/module/personnel/control.php
+++ b/module/personnel/control.php
@@ -114,6 +114,11 @@ class personnel extends control
         $this->app->loadClass('pager', true);
         $pager = pager::init($recTotal, $recPerPage, $pageID);
 
+        /* Set back link. */
+        $goback = $this->session->PRJBrowse ? $this->session->PRJBrowse : $this->createLink('program', 'PRJWhitelist', "projectID=$objectID");
+        if($from == 'pgmbrowse')  $goback = $this->createLink('program', 'PGMBrowse');
+        if($from == 'pgmproject') $goback = $this->session->PGMProject ? $this->session->PGMProject : $this->createLink('program', 'PGMProject', "programID=$programID");
+
         $this->view->title      = $this->lang->personnel->whitelist;
         $this->view->position[] = $this->lang->personnel->whitelist;
 
@@ -122,6 +127,7 @@ 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    = $goback;
         $this->view->programID = $programID;
         $this->view->from      = $from;
 
diff --git a/module/personnel/view/whitelist.html.php b/module/personnel/view/whitelist.html.php
index c1f96d2002..c9c77d4eb9 100644
--- a/module/personnel/view/whitelist.html.php
+++ b/module/personnel/view/whitelist.html.php
@@ -14,7 +14,7 @@
 <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 if($module == 'program') echo html::a($goback, $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 echo html::a($this->createLink($module, $moduleMethod, $vars), '<span class="text">' . $lang->personnel->whitelist . '</span>', '', "class='btn btn-link btn-active-text' $openModule");?>
diff --git a/module/program/control.php b/module/program/control.php
index e66d73babe..6954dd634d 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -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('whitelist', $this->app->getURI(true));
 
         $programType = $this->cookie->programType ? $this->cookie->programType : 'bylist';
 
@@ -415,7 +414,6 @@ class program extends control
         setCookie("lastPGM", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
 
         $this->app->session->set('PGMProject', $this->app->getURI(true));
-        $this->app->session->set('whitelist', $this->app->getURI(true));
 
         $this->lang->navGroup->program = 'program';
         $this->lang->program->switcherMenu   = $this->program->getPGMSwitcher($programID, true);
@@ -795,7 +793,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('whitelist', $this->app->getURI(true));
         $this->loadModel('datatable');
 
         /* Load pager and get tasks. */