From 1742f063688ec4b84dba02cfb4c8236ae5714ff5 Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 2 Mar 2021 13:16:51 +0800
Subject: [PATCH] * Finish task #36312.

---
 module/group/lang/resource.php | 26 ++++++++++++--------------
 module/product/model.php       |  2 +-
 module/program/model.php       |  4 ++--
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 6e936b12cc..b3cb5ddce8 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -319,7 +319,6 @@ $lang->resource->product->edit           = 'edit';
 $lang->resource->product->batchEdit      = 'batchEdit';
 $lang->resource->product->delete         = 'delete';
 $lang->resource->product->roadmap        = 'roadmap';
-$lang->resource->product->doc            = 'doc';
 $lang->resource->product->dynamic        = 'dynamic';
 $lang->resource->product->project        = 'project';
 $lang->resource->product->dashboard      = 'dashboard';
@@ -341,19 +340,18 @@ $lang->product->methodOrder[20]  = 'edit';
 $lang->product->methodOrder[25]  = 'batchEdit';
 $lang->product->methodOrder[35]  = 'delete';
 $lang->product->methodOrder[40]  = 'roadmap';
-//$lang->product->methodOrder[45] = 'doc';
-$lang->product->methodOrder[50]  = 'dynamic';
-$lang->product->methodOrder[55]  = 'project';
-$lang->product->methodOrder[60]  = 'dashboard';
-$lang->product->methodOrder[65]  = 'close';
-$lang->product->methodOrder[70]  = 'updateOrder';
-$lang->product->methodOrder[75]  = 'all';
-$lang->product->methodOrder[80]  = 'manageLine';
-$lang->product->methodOrder[85]  = 'build';
-$lang->product->methodOrder[90]  = 'export';
-$lang->product->methodOrder[95]  = 'whitelist';
-$lang->product->methodOrder[100] = 'addWhitelist';
-$lang->product->methodOrder[105] = 'unbindWhielist';
+$lang->product->methodOrder[45]  = 'dynamic';
+$lang->product->methodOrder[50]  = 'project';
+$lang->product->methodOrder[55]  = 'dashboard';
+$lang->product->methodOrder[60]  = 'close';
+$lang->product->methodOrder[65]  = 'updateOrder';
+$lang->product->methodOrder[70]  = 'all';
+$lang->product->methodOrder[75]  = 'manageLine';
+$lang->product->methodOrder[80]  = 'build';
+$lang->product->methodOrder[85]  = 'export';
+$lang->product->methodOrder[90]  = 'whitelist';
+$lang->product->methodOrder[95]  = 'addWhitelist';
+$lang->product->methodOrder[100] = 'unbindWhielist';
 
 /* Branch. */
 $lang->resource->branch = new stdclass();
diff --git a/module/product/model.php b/module/product/model.php
index f973e75870..3d94646d28 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -887,7 +887,7 @@ class productModel extends model
             ->fetchAll('id');
 
         /* Determine how to display the name of the program. */
-        $programList = $this->loadModel('program')->getParentPairs();
+        $programList = $this->loadModel('program')->getParentPairs('', 'noclosed');
         foreach($projectList as $id => $project) $projectList[$id]->programName = $programList[$project->parent];
 
         return $projectList;
diff --git a/module/program/model.php b/module/program/model.php
index 4cab5cc3f7..04c6d22b49 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -751,11 +751,11 @@ class programModel extends model
      * @access public
      * @return array
      */
-    public function getParentPairs($model = '')
+    public function getParentPairs($model = '', $mode = '')
     {
         $modules = $this->dao->select('id,name,parent,path,grade')->from(TABLE_PROGRAM)
             ->where('type')->eq('program')
-            ->andWhere('status')->ne('closed')
+            ->beginIF(strpos($mode, 'noclosed') === false)->andWhere('status')->ne('closed')->fi()
             ->andWhere('deleted')->eq(0)
             ->beginIF($model)->andWhere('model')->eq($model)->fi()
             ->orderBy('grade desc, `order`')