From 0db7f60ed2df3fcdaaa019b08ebc7293a21fdad8 Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Thu, 22 Jul 2021 15:25:32 +0800
Subject: [PATCH 1/3] * Change ajaxGetProductByRepo function.

---
 module/job/control.php | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/module/job/control.php b/module/job/control.php
index ee9791f323..0854d711a1 100644
--- a/module/job/control.php
+++ b/module/job/control.php
@@ -254,12 +254,30 @@ class job extends control
      *
      * @param  int    $repoID
      * @access public
-     * @return void
+     * @return string
      */
     public function ajaxGetProductByRepo($repoID)
     {
         $repo = $this->loadModel('repo')->getRepoByID($repoID);
-        if($repo) return $repo->product;
-        die(js::error("Access Violation. 非法访问。"));
+        if(empty($repo)) die(json_encode(array(""=>"")));
+
+        $product = $repo->product;
+        if(strpos($product, ','))
+        {
+            $productList     = explode(',', $product);
+            $matchedProducts = array();
+            $productPair     = $this->loadModel('product')->getPairs();
+            foreach($productList as $productLeft)
+            {
+                foreach($productPair as $productRight => $productName)
+                {
+                    if($productLeft == $productRight) $matchedProducts[$productName] = $productRight;
+                }
+            }
+            die(json_encode($matchedProduct));
+        }
+
+        $productName = $this->loadModel('product')->getByID($repo->product)->name;
+        die(json_encode(array($productName => $repo->product)));
     }
 }

From a10a069fd69d77f7091e0703ff19ebecf98a9e20 Mon Sep 17 00:00:00 2001
From: qiyu-xie <xieqiyu@easycorp.ltd>
Date: Thu, 22 Jul 2021 16:00:07 +0800
Subject: [PATCH 2/3] * Finish task#40514.

---
 module/program/view/browsebylist.html.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
index 89a93144a0..51d1d81276 100644
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -46,8 +46,13 @@
 
       <tr <?php echo $trAttrs;?>>
         <td class='c-name text-left <?php if($canOrder) echo 'sort-handler';?>' title='<?php echo $program->name?>'>
-          <?php $class = $program->type == 'program' ? ' table-nest-toggle' : '';?>
-          <span class="table-nest-icon icon icon-<?php echo $program->type;?> <?php echo $class;?>"></span>
+          <?php
+          $icon = '';
+          if($program->type == 'program') $icon = ' icon-program';
+          if($program->type == 'project') $icon = ' icon-common icon-' . (isset($this->config->maxVersion) ? $program->model : $program->type);
+          $class = $program->type == 'program' ? ' table-nest-toggle' : '';
+          ?>
+          <span class="table-nest-icon icon <?php echo $class . $icon;?>"></span>
           <?php if($program->type == 'program'):?>
           <?php echo html::a($this->createLink('program', 'product', "programID=$program->id"), $program->name);?>
           <?php else:?>
@@ -132,7 +137,10 @@
 #programList > thead > tr > th .table-nest-toggle-global {top: 6px}
 #programList > thead > tr > th .table-nest-toggle-global:before {color: #a6aab8;}
 #programTableList > tr:last-child .c-actions .dropdown-menu {top: auto; bottom: 100%; margin-bottom: -5px;}
-#programTableList .icon-project:before {content: '\e99c'; width: 22px; height: 22px; background: none; color: #16a8f8; top: 0; line-height: 22px; margin-right: 2px; font-size: 14px}
+#programTableList .icon-common:before {width: 22px; height: 22px; background: none; color: rgb(166, 170, 184); top: 0; line-height: 22px; margin-right: 2px; font-size: 14px}
+#programTableList .icon-project:before {content: '\e99c';}
+#programTableList .icon-scrum:before {content: '\e9a2';}
+#programTableList .icon-waterfall:before {content: '\e9a4';}
 </style>
 <?php js::set('originOrders', $originOrders);?>
 <script>

From b10592575bf80d42eedc16f02b63262e65633094 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie@easycorp.ltd>
Date: Thu, 22 Jul 2021 17:30:03 +0800
Subject: [PATCH 3/3] * Finish task #40507.

---
 module/doc/model.php | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index 64175bb00d..364ca29d4d 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -1823,19 +1823,43 @@ class docModel extends model
     {
         if($type != 'custom' and $type != 'book' and empty($objects)) return '';
 
-        $output = '';
+        $output             = '';
+        $closedProjectsHtml = '';
+        $clseedProjects     = array();
+        $maxHeight          = ($type == 'project' and $this->app->openApp == 'doc') ? '260px' : '290px';
+        $class              = ($type == 'project' and $this->app->openApp == 'doc') ? 'col-left' : '';
 
         if($this->app->openApp == 'doc' and $type != 'custom' and $type != 'book')
         {
-            $output  = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$objects[$objectID]}'><span class='text'>{$objects[$objectID]}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList'>";
-            $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
-            $output .= "<div class='table-col'><div class='list-group'>";
+            $output  = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$objects[$objectID]}'><span class='text'>{$objects[$objectID]}</span> <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list load-indicator' data-ride='searchList'>";
+            $output .= '<div class="input-control search-box has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input"/><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
+            $output .= "<div class='list-group'><div class='table-row'><div class='table-col $class'><div class='list-group' style='max-height: $maxHeight'>";
+            if($type == 'project' and $this->app->openApp == 'doc')
+            {
+                $clseedProjects = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in(array_keys($objects))->andWhere('status')->eq('closed')->fetchPairs();
+            }
+
             foreach($objects as $key => $object)
             {
                 $selected = $key == $objectID ? 'selected' : '';
-                $output  .= html::a(inlink('objectLibs', "type=$type&objectID=$key"), $object, '', "class='$selected' data-app='{$this->app->openApp}'");
+                if(isset($clseedProjects[$key]))
+                {
+                    $closedProjectsHtml .= html::a(inlink('objectLibs', "type=$type&objectID=$key"), $object, '', "class='$selected' data-app='{$this->app->openApp}'");
+                    if($selected == 'selected') $tabActive = 'closed';
+                }
+                else
+                {
+                    $output .= html::a(inlink('objectLibs', "type=$type&objectID=$key"), $object, '', "class='$selected' data-app='{$this->app->openApp}'");
+                }
+            }
+            if($type == 'project' and $this->app->openApp == 'doc')
+            {
+                $output .= "</div><div class='col-footer'><a class='pull-right toggle-right-col not-list-item'>{$this->lang->project->doneProjects}<i class='icon icon-angle-right'></i></a></div></div><div class='table-col col-right'> <div class='list-group'>$closedProjectsHtml</div></div></div></div></div></div></div>";
+            }
+            else
+            {
+                $output .= "</div></div></div></div></div></div></div>";
             }
-            $output .= "</div></div></div></div></div>";
         }
 
         if(!empty($libs))