From b0b9910153dc6116bcf5ed4774fc737f5c1108ca Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 31 Mar 2023 10:41:32 +0800
Subject: [PATCH 1/4] * Modify locate param.

---
 module/api/control.php                 |  1 -
 module/api/model.php                   |  7 ++-----
 module/doc/view/lefttree.html.php      | 14 +++++++++++++-
 module/doc/view/showfiles.html.php     |  2 --
 module/doc/view/tablecontents.html.php |  2 --
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/module/api/control.php b/module/api/control.php
index 62561e69ee..f526cdf16f 100755
--- a/module/api/control.php
+++ b/module/api/control.php
@@ -111,7 +111,6 @@ class api extends control
         }
 
         $this->view->lib            = $lib;
-        $this->view->isRelease      = $release > 0;
         $this->view->release        = $release;
         $this->view->title          = $this->lang->api->pageTitle;
         $this->view->libID          = $libID;
diff --git a/module/api/model.php b/module/api/model.php
index 102adb44ff..f11580ed80 100644
--- a/module/api/model.php
+++ b/module/api/model.php
@@ -1039,7 +1039,6 @@ class apiModel extends model
      * @param  int    $moduleID
      * @param  int    $objectID
      * @param  string $browseType bySearch
-
      * @access public
      * @return array
      */
@@ -1051,18 +1050,16 @@ class apiModel extends model
         foreach($libTree as &$tree)
         {
             $tree->versions    = array();
-            $tree->lastVersion = '';
             foreach($releases as $index => $release)
             {
                 if($tree->id == $release->lib)
                 {
-                    if(empty($tree->versions)) $tree->lastVersion = $release->version;
-
-                    $tree->versions[] = $release->version;
+                    $tree->versions[] = $release;
                     unset($releases[$index]);
                 }
             }
         }
+
         return $libTree;
     }
 }
diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php
index 55b23436b7..393a2dc159 100644
--- a/module/doc/view/lefttree.html.php
+++ b/module/doc/view/lefttree.html.php
@@ -49,6 +49,15 @@
 #leftBar .selectBox #currentItem > .text {overflow: hidden; text-align: left; flex: 0 1 100%;}
 </style>
 
+<?php
+/* Release used for api space. */
+js::set('release',    isset($release) ? $release : 0);
+
+/* ObjectType and objectID used for other space. */
+js::set('objectType', isset($type) ? $type : '');
+js::set('objectID',   isset($objectID) ? $objectType : '');
+?>
+
 <div id="fileTree" class="file-tree">
 <?php if(isset($type) and $type == 'project'):?>
 <div class="project-tree">
@@ -134,6 +143,8 @@ $(function()
         var dropdown = '<ul class="dropdown-menu dropdown-in-tree" id="' + option.type + '" style="display: unset; left:' + option.left + 'px; top:' + option.top + 'px;">';
         dropdown += $(libClass).html().replace(/%libID%/g, option.libID).replace(/%moduleID%/g, option.moduleID).replace(/%hasChildren%/g, option.hasChildren);
         dropdown += '</ul>';
+
+        if(typeof(option.moduleType) != 'undefined' && option.moduleType == 'api') dropdown = dropdown.replace(/doc/g, 'api');
         return dropdown;
     }
 
@@ -221,7 +232,8 @@ $(function()
                 type        : dropDownID,
                 libID       : libID,
                 moduleID    : moduleID,
-                hasChildren : hasChildren
+                hasChildren : hasChildren,
+                moduleType  : moduleType
             };
 
             var dropDown = renderDropdown(option);
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index d95fd05250..dfe60e5b67 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -15,8 +15,6 @@
 <?php js::set('linkParams', "type=$type&objectID=$objectID%s");?>
 <?php js::set('docLang', $lang->doc);?>
 <?php js::set('libType', 'annex');?>
-<?php js::set('objectType', $type);?>
-<?php js::set('objectID', $objectID);?>
 <?php js::set('canViewFiles', common::hasPriv('doc', 'showfiles'));?>
 <?php js::set('type', $type);?>
 <?php js::set('tab', $this->app->tab);?>
diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php
index d8c5109f0f..51a943c8ad 100644
--- a/module/doc/view/tablecontents.html.php
+++ b/module/doc/view/tablecontents.html.php
@@ -15,8 +15,6 @@
 <?php js::set('linkParams', "type=$type&objectID=$objectID%s&browseType=&orderBy=$orderBy");?>
 <?php js::set('docLang', $lang->doc);?>
 <?php js::set('libType', $libType);?>
-<?php js::set('objectType', $type);?>
-<?php js::set('objectID', $objectID);?>
 <?php js::set('canViewFiles', common::hasPriv('doc', 'showfiles'));?>
 <div id="mainMenu" class="clearfix">
   <div id="leftBar" class="btn-toolbar pull-left">

From e24a70f5b794edca2e53073550e24c641d46ccc2 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 31 Mar 2023 10:46:30 +0800
Subject: [PATCH 2/4]  * code for task #89150.

---
 module/doc/control.php     | 2 +-
 module/doc/js/common.js    | 2 +-
 module/project/control.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/doc/control.php b/module/doc/control.php
index 7585435f7d..bfd82f5997 100755
--- a/module/doc/control.php
+++ b/module/doc/control.php
@@ -395,7 +395,7 @@ class doc extends control
             if($objectType == 'project')
             {
                 $objects = $this->loadModel('project')->getPairs();
-                $this->view->executions = array(0 => '') + $this->loadModel('execution')->getPairs($objectID, 'all', 'multiple');
+                $this->view->executions = array(0 => '') + $this->loadModel('execution')->getPairs($objectID, 'all', 'multiple,leaf,noprefix');
             }
             elseif($objectType == 'execution')
             {
diff --git a/module/doc/js/common.js b/module/doc/js/common.js
index 0ec4c3e2dd..196c3bb582 100644
--- a/module/doc/js/common.js
+++ b/module/doc/js/common.js
@@ -21,7 +21,7 @@ function loadObjectModules(objectType, objectID)
  */
 function loadExecutions(projectID)
 {
-    var link = createLink('project', 'ajaxGetExecutions', "projectID=" + projectID + "&executionID=0&mode=multiple");
+    var link = createLink('project', 'ajaxGetExecutions', "projectID=" + projectID + "&executionID=0&mode=multiple,leaf,noprefix");
     $('#executionBox').load(link, function(){$('#executionBox').find('select').attr('data-placeholder', holders.execution).attr('onchange', "loadObjectModules('execution', this.value)").chosen()});
     loadObjectModules('project', projectID);
 }
diff --git a/module/project/control.php b/module/project/control.php
index 01a1002ec0..18e538cef6 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -201,7 +201,7 @@ class project extends control
     {
         $project = $this->project->getByID($projectID);
         if(!$project->multiple) return;
-         
+
         $executions       = $this->loadModel('execution')->getByProject($projectID, 'undone', 0, true);
         $executionMembers = $this->dao->select('t1.root,t2.name')->from(TABLE_TEAM)->alias('t1')
             ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.root=t2.id')

From b47c1d5f45c70c9c98570089ca79410d927baa72 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 31 Mar 2023 10:56:25 +0800
Subject: [PATCH 3/4] * Modify code error.

---
 module/api/model.php                     | 2 ++
 module/api/view/ajaxgetdropmenu.html.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/api/model.php b/module/api/model.php
index f11580ed80..25aa4d9075 100644
--- a/module/api/model.php
+++ b/module/api/model.php
@@ -985,6 +985,8 @@ class apiModel extends model
      */
     public function getOrderedObjects()
     {
+        $normalObjects = $closedObjects = array();
+
         $libs     = $this->loadModel('doc')->getApiLibs();
         $products = $this->dao->select('t1.id, t1.name, t1.status')->from(TABLE_PRODUCT)->alias('t1')
             ->leftjoin(TABLE_DOCLIB)->alias('t2')->on('t2.product=t1.id')
diff --git a/module/api/view/ajaxgetdropmenu.html.php b/module/api/view/ajaxgetdropmenu.html.php
index 03a045ec9e..4841e29ddf 100644
--- a/module/api/view/ajaxgetdropmenu.html.php
+++ b/module/api/view/ajaxgetdropmenu.html.php
@@ -49,8 +49,8 @@ foreach(array('product', 'project') as $moduleType)
 
     if($moduleType  == 'product')
     {
-        if($normalObjects['project'] and (!empty($nolinkLibs) or !empty($normalObjects['product']))) $normalObjectsHtml .= '<li class="divider"></li>';
-        if($closedObjects['project'] and !empty($normalObjects['product'])) $closedObjectsHtml .= '<li class="divider"></li>';
+        if(!empty($normalObjects['project']) and (!empty($nolinkLibs) or !empty($normalObjects['product']))) $normalObjectsHtml .= '<li class="divider"></li>';
+        if(!empty($closedObjects['project']) and !empty($normalObjects['product'])) $closedObjectsHtml .= '<li class="divider"></li>';
     }
 }
 $normalObjectsHtml .= '</ul>';

From 1d51a5ab1106f13f9915b8518d8c74895d50a5f3 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 31 Mar 2023 10:59:28 +0800
Subject: [PATCH 4/4] * Fix bug of edit api lib.

---
 module/api/view/editlib.html.php |  2 +-
 module/doc/model.php             | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/module/api/view/editlib.html.php b/module/api/view/editlib.html.php
index f5b0be4632..c7f2fb46d0 100644
--- a/module/api/view/editlib.html.php
+++ b/module/api/view/editlib.html.php
@@ -57,7 +57,7 @@
               </td>
             </tr>
             <tr>
-              <td class='text-center form-actions' colspan='2'><?php echo html::submitButton();?></td>
+              <td class='text-center form-actions' colspan='2'><?php echo html::hidden('type', $type) . html::submitButton();?></td>
             </tr>
           </table>
         </form>
diff --git a/module/doc/model.php b/module/doc/model.php
index 6fee689960..bd42f3bde2 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -278,16 +278,13 @@ class docModel extends model
      */
     public function updateApiLib($id)
     {
-        $oldLib  = $this->getLibById($id);
-        $libType = $this->post->libType;
+        $oldLib = $this->getLibById($id);
 
         $data = fixer::input('post')
             ->trim('name')
             ->join('groups', ',')
             ->join('users', ',')
-            ->setForce('product', $libType == 'product' ? $this->post->product : 0)
-            ->setForce('project', $libType == 'project' ? $this->post->project : 0)
-            ->remove('uid,contactListMenu,libType')
+            ->remove('uid,contactListMenu,type')
             ->get();
 
         $this->app->loadLang('api');
@@ -298,10 +295,7 @@ class docModel extends model
         $this->lang->doclib->project = $this->lang->api->project;
         $this->lang->doclib->product = $this->lang->api->product;
 
-        if($libType == 'product') $this->config->api->createlib->requiredFields .= ',product';
-        if($libType == 'project') $this->config->api->createlib->requiredFields .= ',project';
-
-        $this->checkApiLibName($data, $libType, $id);
+        $this->checkApiLibName($data, $this->post->type, $id);
 
         if(dao::isError()) return false;