From 8a9fe39063dc6c828f37a3019a25165f6620f13e Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Tue, 23 Feb 2021 09:08:56 +0800
Subject: [PATCH 1/5] * Adjust the table style.

---
 module/personnel/view/putinto.html.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/personnel/view/putinto.html.php b/module/personnel/view/putinto.html.php
index e3a12ef3af..74ff77e190 100644
--- a/module/personnel/view/putinto.html.php
+++ b/module/personnel/view/putinto.html.php
@@ -11,7 +11,8 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <style>
-.main-table thead>tr>th:first-child{padding-left: 0px;}
+.main-table thead>tr>th:first-child {padding-left: 8px;}
+.table.has-sort-head thead>tr>th {padding-right: 8px;}
 </style>
 <div id="mainContent" class="main-row fade">
   <?php if(!empty($inputPersonnel)):?>

From 535fb750b3d81b977110104379960a3a195f9231 Mon Sep 17 00:00:00 2001
From: wangyidong <wyd621@163.com>
Date: Tue, 23 Feb 2021 09:12:20 +0800
Subject: [PATCH 2/5]  * code for change after15mode to mode.

---
 module/custom/control.php              | 10 +++++-----
 module/custom/view/header.html.php     |  2 +-
 module/custom/view/mode.html.php       |  2 +-
 module/upgrade/control.php             |  8 ++++----
 module/upgrade/view/to15guide.html.php |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/module/custom/control.php b/module/custom/control.php
index 025c6d528a..80829f22e8 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -604,13 +604,13 @@ class custom extends control
     {
         if($_POST)
         {
-            $after15mode = fixer::input('post')->get('after15mode');
-            $this->loadModel('setting')->setItem('system.custom.after15mode', $after15mode);
-            if($after15mode == 'new') $this->locate($this->createLink('upgrade', 'mergeTips'));
+            $mode = fixer::input('post')->get('mode');
+            $this->loadModel('setting')->setItem('system.common.global.mode', $mode);
+            if($mode == 'new') $this->locate($this->createLink('upgrade', 'mergeTips'));
         }
 
-        $after15mode = zget($this->config->custom, 'after15mode', 'old');
-        if($after15mode == 'new')
+        $mode = zget($this->config->global, 'mode', 'old');
+        if($mode == 'new')
         {
             if(isset($this->config->global->upgradeStep) and $this->config->global->upgradeStep == 'mergeProgram') $this->locate($this->createLink('upgrade', 'mergeProgram'));
 
diff --git a/module/custom/view/header.html.php b/module/custom/view/header.html.php
index d6ff2052d6..babd1f48d3 100644
--- a/module/custom/view/header.html.php
+++ b/module/custom/view/header.html.php
@@ -12,7 +12,7 @@
   {
       common::printLink('custom', $sysObject, "", "<span class='text'>{$lang->custom->$sysObject}</span>", '', "class='btn btn-link' id='{$sysObject}Tab'");
   }
-  if(isset($config->custom->after15mode) and $config->custom->after15mode == 'old')
+  if(isset($config->global->mode) and $config->global->mode == 'old')
   {
       common::printLink('custom', 'mode', "", "<span class='text'>{$lang->custom->mode}</span>", '', "class='btn btn-link' id='modeTab'");
   }
diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php
index d9b5cfe816..1b481d7a90 100644
--- a/module/custom/view/mode.html.php
+++ b/module/custom/view/mode.html.php
@@ -22,7 +22,7 @@
       <tr>
         <th class='text-top'><?php echo $lang->custom->mode;?></th>
         <td>
-          <p><label class="radio-inline"><input type="radio" name="after15mode" value="new" checked='checked' id="after15modenew"><?php echo $lang->upgrade->to15Mode['new'];?></label></p>
+          <p><label class="radio-inline"><input type="radio" name="mode" value="new" checked='checked' id="modenew"><?php echo $lang->upgrade->to15Mode['new'];?></label></p>
           <p class='text-info'><?php echo $lang->upgrade->selectedModeTips['new'];?></p>
         </td>
       </tr>
diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index fbce010d4b..98e42a3459 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -161,11 +161,11 @@ class upgrade extends control
     {
         if($_POST)
         {
-            $after15mode = fixer::input('post')->get('after15mode');
-            $this->loadModel('setting')->setItem('system.custom.after15mode', $after15mode);
+            $mode = fixer::input('post')->get('mode');
+            $this->loadModel('setting')->setItem('system.common.global.mode', $mode);
 
-            if($after15mode == 'old') $this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
-            if($after15mode == 'new') $this->locate(inlink('mergeTips'));
+            if($mode == 'old') $this->locate(inlink('afterExec', "fromVersion=$fromVersion"));
+            if($mode == 'new') $this->locate(inlink('mergeTips'));
         }
 
         $this->view->title = $this->lang->upgrade->to15Guide;
diff --git a/module/upgrade/view/to15guide.html.php b/module/upgrade/view/to15guide.html.php
index 876b7bc985..03d2ef6c21 100644
--- a/module/upgrade/view/to15guide.html.php
+++ b/module/upgrade/view/to15guide.html.php
@@ -18,7 +18,7 @@
       <div class='panel-body'>
         <div style='width:600px; margin: auto;'>
           <?php echo $lang->upgrade->to15Desc;?>
-          <?php echo html::radio('after15mode', $lang->upgrade->to15Mode, 'old');?>
+          <?php echo html::radio('mode', $lang->upgrade->to15Mode, 'old');?>
           <div id='selectedModeTips' class='text-info'><?php echo $lang->upgrade->selectedModeTips['old'];?></div>
         </div>
       </div>
@@ -30,7 +30,7 @@
 <script>
 $(function()
 {
-    $('[name=after15mode]').change(function()
+    $('[name=mode]').change(function()
     {
         $('#selectedModeTips').html(selectedModeTips[$(this).val()]);
     })

From 424c6ae400cc66976b96c4bdb92f55acf1eb848d Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 23 Feb 2021 09:30:09 +0800
Subject: [PATCH 3/5] * Code for details.

---
 module/product/control.php | 3 ++-
 module/program/model.php   | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index c9a84a703a..e9d4d82462 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -332,7 +332,7 @@ class product extends control
         $this->view->qdUsers    = $qdUsers;
         $this->view->rdUsers    = $rdUsers;
         $this->view->users      = $this->user->getPairs('nodeleted|noclosed');
-        $this->view->programs   = array('') + $this->loadModel('program')->getTopPGMPairs();
+        $this->view->programs   = array('') + $this->loadModel('program')->getTopPGMPairs('', 'noclosed');
         $this->view->URSRPairs  = $this->loadModel('custom')->getURSRPairs();
 
         unset($this->lang->product->typeList['']);
@@ -440,6 +440,7 @@ class product extends control
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
         }
 
+        $productID = $this->product->saveState($productID, $this->products);
         $this->product->setMenu($this->products, $productID);
 
         $moduleIndex = array_search('product', $this->lang->noMenuModule);
diff --git a/module/program/model.php b/module/program/model.php
index 5e971571ba..2b52955fa2 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -442,15 +442,16 @@ class programModel extends model
      * Get top program pairs.
      *
      * @param  string $model
+     * @param  string $mode
      * @access public
      * @return array
      */
-    public function getTopPGMPairs($model = '')
+    public function getTopPGMPairs($model = '', $mode = '')
     {
         return $this->dao->select('id,name')->from(TABLE_PROGRAM)
             ->where('type')->eq('program')
             ->andWhere('grade')->eq(1)
-            ->andWhere('status')->ne('closed')
+            ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
             ->andWhere('id')->in($this->app->user->view->programs)
             ->andWhere('deleted')->eq(0)
             ->beginIF($model)->andWhere('model')->eq($model)->fi()

From ecfb315a37b5d70c73e2b5bc7087f2588d0ec8fb Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 23 Feb 2021 09:45:04 +0800
Subject: [PATCH 4/5] * Finish task #36018.

---
 module/user/model.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/user/model.php b/module/user/model.php
index 2288eef5d2..b0d5a2e927 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -437,6 +437,7 @@ class userModel extends model
         $userID = $oldUser->id;
         $user   = fixer::input('post')
             ->setDefault('join', '0000-00-00')
+            ->setDefault('company', 0)
             ->setIF($this->post->password1 != false, 'password', substr($this->post->password1, 0, 32))
             ->setIF($this->post->email != false, 'email', trim($this->post->email))
             ->remove('new, password1, password2, groups,verifyPassword, passwordStrength')
@@ -1537,9 +1538,9 @@ class userModel extends model
             /* Init objects. */
             static $allProducts, $allPrograms, $allProjects, $allSprints, $teams, $stakeholders, $productWhiteList, $whiteList;
             if($allProducts === null) $allProducts = $this->dao->select('id,PO,QD,RD,createdBy,acl,whitelist,program,createdBy')->from(TABLE_PRODUCT)->where('acl')->ne('open')->fetchAll('id');
-            if($allProjects === null) $allProjects = $this->dao->select('id,PO,PM,QD,RD,acl,type,parent,openedBy')->from(TABLE_PROJECT)->where('acl')->ne('open')->andWhere('type')->eq('project')->fetchAll('id');
-            if($allPrograms === null) $allPrograms = $this->dao->select('id,PO,PM,QD,RD,acl,type,openedBy')->from(TABLE_PROJECT)->where('acl')->ne('open')->andWhere('type')->eq('program')->fetchAll('id');
-            if($allSprints  === null) $allSprints  = $this->dao->select('id,PO,PM,QD,RD,acl,project,parent,type,openedBy')->from(TABLE_PROJECT)->where('acl')->eq('private')->andWhere('type')->in('sprint,stage')->fetchAll('id');
+            if($allProjects === null) $allProjects = $this->dao->select('id,PO,PM,QD,RD,acl,type,path,parent,openedBy')->from(TABLE_PROJECT)->where('acl')->ne('open')->andWhere('type')->eq('project')->fetchAll('id');
+            if($allPrograms === null) $allPrograms = $this->dao->select('id,PO,PM,QD,RD,acl,type,path,openedBy')->from(TABLE_PROJECT)->where('acl')->ne('open')->andWhere('type')->eq('program')->fetchAll('id');
+            if($allSprints  === null) $allSprints  = $this->dao->select('id,PO,PM,QD,RD,acl,project,path,parent,type,openedBy')->from(TABLE_PROJECT)->where('acl')->eq('private')->andWhere('type')->in('sprint,stage')->fetchAll('id');
 
             /* Get teams. */
             if($teams === null)

From 4fa5fdb2a7435228931bd40abb2d2b6cdd6e478a Mon Sep 17 00:00:00 2001
From: wangyidong <wyd621@163.com>
Date: Tue, 23 Feb 2021 09:55:50 +0800
Subject: [PATCH 5/5]  * adjust code.

---
 module/program/control.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/module/program/control.php b/module/program/control.php
index b045e826b7..dc3a3063b3 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -1844,7 +1844,7 @@ class program extends control
      * @param  int    $programID
      * @param  int    $projectID
      * @access public
-     * @return array
+     * @return void
      */
     public function ajaxCheckProduct($programID, $projectID)
     {
@@ -1856,7 +1856,8 @@ class program extends control
         if($oldTopPGM == $newTopPGM) die();
 
         $response  = array();
-        $response['result'] = true;
+        $response['result']  = true;
+        $response['message'] = $this->lang->program->changeProgramTip;
 
         $multiLinkedProducts = $this->program->getMultiLinkedProducts($projectID);
         if($multiLinkedProducts)
@@ -1870,10 +1871,6 @@ class program extends control
             $response['message']             = $multiLinkedProducts;
             $response['multiLinkedProjects'] = $multiLinkedProjects;
         }
-        else
-        {
-            $response['message']   = $this->lang->program->changeProgramTip;
-        }
         die(json_encode($response));
     }
 }