Merge branch 'tsj_fixbug' into 'master'

* Fix bug.

See merge request easycorp/zentaopms!7304

module/api/control.php

@@ -431,7 +431,7 @@ class api extends control
         $this->view->objectID = $objectID;
         $this->view->groups   = $this->loadModel('group')->getPairs();
         $this->view->users    = $this->user->getPairs('nocode|noclosed');
-        $this->view->projects = $this->loadModel('project')->getPairsByModel();
+        $this->view->projects = $this->loadModel('project')->getPairsByModel('scrum,waterfall,agileplus,waterfallplus');
         $this->view->products = $this->loadModel('product')->getPairs();
 
         $this->display();

module/api/css/index.css

@@ -24,7 +24,7 @@
 .no-content-button {text-align: center; padding-top: 20px;}
 .no-content-button a:nth-child(2) {margin-left: 20px;}
 
-.cell .detail .detail-title {padding-left: 5px; list-style: none;}
+.apiList .detail .detail-title {padding-left: 5px; list-style: none;}
 .menu-actions {position: absolute; top: 7px; right: 45px; padding: 7px 8px;}
 .detail ul {position: relative;}
 .tail-info {position: absolute; right: 0; padding-left: 10px; padding-top: 1px;}
@@ -46,7 +46,7 @@ span.dotted-line+a {display: block;}
 .is-sorting > li > .tree-group {opacity: 1; border-radius: 4px;}
 .is-sorting > li ul {display: none!important;}
 li.drag-shadow ul {display: none!important;}
-.cell {height: 100%;}
+.apiList {height: 100%;}
 
 #queryBox #groupAndOr {min-width: 60px;}
 .tree li>.list-toggle {left: -4px;}

module/api/view/apilist.html.php

@@ -81,7 +81,7 @@
   <?php include './content.html.php';?>
 <?php else:?>
 <?php if(empty($libs) || empty($apiList)):?>
-<div class="cell">
+<div class="cell apiList">
   <div class="detail">
     <li class="detail-title"><?php echo intval($libID) > 0 ? $lang->api->apiList : $lang->api->pageTitle;?></li>
   </div>

module/api/view/createlib.html.php

@@ -28,13 +28,13 @@
                 <span><?php echo html::radio('libType', $lang->api->libTypeList, $type, "onchange='toggleLibType(this.value)'")?></span>
               </td>
             </tr>
-            <tr id='productBox'>
+            <tr id='productBox' class="<?php if($type != 'product') echo 'hidden';?>">
               <th><?php echo $lang->api->product;?></th>
               <td class='required'>
                 <span><?php echo html::select('product', $products, $objectID, "class='form-control chosen'")?></span>
               </td>
             </tr>
-            <tr id='projectBox' class='hidden'>
+            <tr id='projectBox' class="<?php if($type != 'project') echo 'hidden';?>">
               <th><?php echo $lang->api->project;?></th>
               <td class='required'>
                 <span><?php echo html::select('project', $projects, $objectID, "class='form-control chosen'")?></span>

module/api/view/editlib.html.php

@@ -42,7 +42,7 @@
                 <span><?php echo html::radio('acl', $lang->api->aclList, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'", 'block')?></span>
               </td>
             </tr>
-            <tr id='whiteListBox' class='<?php echo $lib->acl != 'open' ? '' : 'hidden';?>'>
+            <tr id='whiteListBox' class='<?php echo $lib->acl == 'private' ? '' : 'hidden';?>'>
               <th><?php echo $lang->api->whiteList;?></th>
               <td>
                 <div class='input-group'>