Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3

module/api/control.php

@@ -94,7 +94,7 @@ class api extends control
         $this->view->objectType     = $objectType;
         $this->view->objectID       = $objectID;
         $this->view->moduleID       = $moduleID;
-        $this->view->libTree        = $this->api->getLibTree($libID, $libs, $objectID);
+        $this->view->libTree        = $this->api->getLibTree($libID, $libs, $moduleID);
         $this->view->users          = $this->user->getPairs('noclosed,noletter');
         $this->view->objectDropdown = isset($libs[$libID]) ? $this->generateLibsDropMenu($libs[$libID], $release) : '';
 

module/api/css/common.css

@@ -174,3 +174,8 @@ form .table-data, #content .table-data {border: 1px solid #e2e2e3;}
 .detail+.detail {border-top: 0px;}
 .menu-title {display: flex; align-items: center; justify-content: space-between;}
 .vision-drop.dropdown {padding-right: 35px;}
+
+#bysearchTab::before {display: none;}
+#leftBar .selectBox #currentItem {width: 150px; display: flex; align-items: center;}
+[lang^=zh] #leftBar .selectBox #currentItem {width: 180px;}
+#leftBar .selectBox #currentItem > .text {overflow: hidden; text-align: left; flex: 0 1 100%;}

module/api/view/index.html.php

@@ -58,7 +58,7 @@
     <li data-method="addCataLib" data-has-children='%hasChildren%'  data-libid='%libID%' data-moduleid="%moduleID%" data-type="add"><a><i class="icon icon-controls"></i><?php echo $lang->doc->libDropdown['addModule'];?></a></li>
     <?php endif;?>
     <?php if(common::hasPriv('api', 'editLib')):?>
-    <li data-method="editLib"><a href='<?php echo inlink('editLib', 'libID=%libID%');?>' data-toggle='modal' data-type='iframe'><i class="icon icon-edit"></i><?php echo $lang->api->libDropdown['editLib'];?></a></li>
+    <li data-method="editLib"><a href='<?php echo inlink('editLib', 'libID=%libID%');?>' data-toggle='modal' data-type='iframe'><i class="icon icon-edit"></i><?php echo $lang->doc->libDropdown['editLib'];?></a></li>
     <?php endif;?>
     <?php if(common::hasPriv('api', 'deleteLib')):?>
     <li data-method="deleteLib"><a href='<?php echo inlink('deleteLib', 'libID=%libID%');?>' target='hiddenwin'><i class="icon icon-trash"></i><?php echo $lang->doc->libDropdown['deleteLib'];?></a></li>

module/doc/control.php

@@ -405,7 +405,8 @@ class doc extends control
                 }
                 elseif($objectType == 'execution')
                 {
-                    $objects = $this->loadModel('execution')->getPairs();
+                    $execution = $this->loadModel('execution')->getById($objectID);
+                    $objects   = $this->execution->getPairs($execution->project, 'all', "multiple,leaf,noprefix");
                 }
                 elseif($objectType == 'product')
                 {

module/doc/model.php

@@ -2978,6 +2978,13 @@ class docModel extends model
         return $html;
     }
 
+    /**
+     * Get option menu  for libs.
+     *
+     * @param  array  $libs
+     * @access public
+     * @return array
+     */
     public function getLibsOptionMenu($libs)
     {
         $this->loadModel('tree');

module/doc/view/createtexttype.html.php

@@ -65,6 +65,11 @@
                   <th><?php echo $lang->doc->execution?></th>
                   <td id='executionBox'><?php echo html::select('execution', $executions, '', "class='form-control chosen' data-placeholder='{$lang->doc->placeholder->execution}' onchange='loadObjectModules(\"execution\", this.value)'")?></td>
                 </tr>
+                <?php elseif($objectType == 'execution'):?>
+                <tr>
+                  <th><?php echo $lang->doc->execution;?></th>
+                  <td class='required'><?php echo html::select('execution', $objects, $objectID, "class='form-control chosen' onchange='loadObjectModules(\"execution\", this.value)'");?></td>
+                </tr>
                 <?php elseif($objectType == 'product'):?>
                 <tr>
                   <th><?php echo $lang->doc->product;?></th>