* Fix bug#15658,15644

module/api/js/common.js

@@ -200,6 +200,14 @@ try {
                     }
                 }
             },
+            current:
+            {
+                type: Array
+            },
+            ckey:
+            {
+                type: Number
+            }
         },
         watch: {
             value: {
@@ -209,6 +217,14 @@ try {
                 deep: true,
             }
         },
+        computed:
+        {
+            typeOptionsFilter: function()
+            {
+                if(this.current[this.ckey + 1] && this.current[this.ckey + 1].parentKey && this.current[this.ckey + 1].parentKey == this.current[this.ckey].key) return typeOptions.slice(0, 2);
+                return typeOptions;
+            }
+        },
         methods: {
             add() {
                 this.$emit('add', this.value)
@@ -229,7 +245,7 @@ try {
           </td>
           <td class="w-100px">
               <select class="form-control" v-model="value.paramsType">
-                <option v-for="item in typeOptions" :value="item.value">{{item.label}}</option>
+                <option v-for="item in typeOptionsFilter" :value="item.value">{{item.label}}</option>
               </select>
           </td>
           <td class="w-80px">
@@ -435,7 +451,7 @@ try {
                   </thead>
                   <tbody>
                     <template v-for="(item,key) in current">
-                      <param-field :value.sync="item" @add="add(current, $event)" @del="del(current, key)"  @sub="addSub(current, key, $event)"></param-field>
+                      <param-field :current="current" :ckey="key" :value.sync="item" @add="add(current, $event)" @del="del(current, key)"  @sub="addSub(current, key, $event)"></param-field>
                     </template>
                   </tbody>
               </table>

module/api/view/index.html.php

@@ -31,7 +31,7 @@
             echo "<div class='menu-actions'>";
             echo html::a('javascript:;', "<i class='icon icon-ellipsis-v'></i>", '', "data-toggle='dropdown' class='btn btn-link'");
             echo "<ul class='dropdown-menu pull-right'>";
-            if($canTreeBrowse) echo '<li>' . html::a($this->createLink('tree', 'browse', "rootID=$libID&view=api", '', true), '<i class="icon-cog-outline"></i> ' . $this->lang->api->manageType, '', "class='iframe'") . '</li>';
+            if($canTreeBrowse) echo '<li>' . html::a($this->createLink('tree', 'browse', "rootID=$libID&view=api", '', true), '<i class="icon-cog-outline"></i> ' . $this->lang->api->manageType, '', "class='iframe' data-width='1200px'") . '</li>';
             if($canViewReleases) echo '<li>' . html::a($this->createLink('api', 'releases', "libID=$libID", '', true), '<i class="icon-version"></i> ' . $this->lang->api->managePublish, '', "class='iframe'") . '</li>';
             echo "<li class='divider'></li>";
             if($canEditLib) echo '<li>' . html::a($this->createLink('api', 'editLib', "rootID=$libID"), '<i class="icon-edit"></i> ' . $lang->api->editLib, '', "class='iframe'") . '</li>';