From 5479e2db3fd5fe858ad1581437312486d3e1a2ed Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 19 Oct 2021 18:40:55 +0800
Subject: [PATCH] * Code for bug#15615.

---
 module/api/view/index.html.php  | 28 +++++++++++-----------------
 module/group/lang/changelog.php |  1 +
 module/group/lang/resource.php  |  2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/module/api/view/index.html.php b/module/api/view/index.html.php
index fbb9c6fb60..debb6b85c0 100644
--- a/module/api/view/index.html.php
+++ b/module/api/view/index.html.php
@@ -20,28 +20,22 @@
       <div id='title'>
         <li class='menu-title'><?php echo $this->lang->api->module;?></li>
         <?php
-        if(!$isRelease)
+        $canTreeBrowse  = common::hasPriv('tree', 'browse');
+        $canEditPublish = common::hasPriv('api', 'editPublish');
+        $canEditLib     = common::hasPriv('api', 'editLib');
+        $canDeleteLib   = common::hasPriv('api', 'deleteLib');
+        $haveMoreButton = ($canTreeBrowse or $canEditPublish or $canEditLib or $canDeleteLib);
+
+        if(!$isRelease and $haveMoreButton)
         {
             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(common::hasPriv('tree', 'browse'))
-            {
-                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(common::hasPriv('api', 'publish'))
-            {
-                echo '<li>' . html::a($this->createLink('api', 'editPublish', "libID=$libID", '', true), '<i class="icon-cog-outline"></i> ' . $this->lang->api->managePublish, '', "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'") . '</li>';
+            if($canEditPublish) echo '<li>' . html::a($this->createLink('api', 'editPublish', "libID=$libID", '', true), '<i class="icon-cog-outline"></i> ' . $this->lang->api->managePublish, '', "class='iframe'") . '</li>';
             echo "<li class='divider'></li>";
-            if(common::hasPriv('api', 'createLib'))
-            {
-                echo '<li>' . html::a($this->createLink('api', 'editLib', "rootID=$libID"), '<i class="icon-edit"></i> ' . $lang->api->editLib, '', "class='iframe'") . '</li>';
-            }
-            if(common::hasPriv('api', 'deleteLib'))
-            {
-                echo '<li>' . html::a($this->createLink('api', 'deleteLib', "rootID=$libID"), '<i class="icon-trash"></i> ' . $lang->api->deleteLib, 'hiddenwin') . '</li>';
-            }
+            if($canEditLib) echo '<li>' . html::a($this->createLink('api', 'editLib', "rootID=$libID"), '<i class="icon-edit"></i> ' . $lang->api->editLib, '', "class='iframe'") . '</li>';
+            if($canDeleteLib) echo '<li>' . html::a($this->createLink('api', 'deleteLib', "rootID=$libID"), '<i class="icon-trash"></i> ' . $lang->api->deleteLib, 'hiddenwin') . '</li>';
             echo '</ul></div>';
         }
         ?>
diff --git a/module/group/lang/changelog.php b/module/group/lang/changelog.php
index 24bc48ab5f..1119883301 100644
--- a/module/group/lang/changelog.php
+++ b/module/group/lang/changelog.php
@@ -437,3 +437,4 @@ $lang->changelog['15.7'][] = 'api-deleteStruct';
 $lang->changelog['15.7'][] = 'api-create';
 $lang->changelog['15.7'][] = 'api-edit';
 $lang->changelog['15.7'][] = 'api-delete';
+$lang->changelog['15.7'][] = 'api-editPublish';
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 1130de176d..eca7607b39 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1390,7 +1390,7 @@ $lang->resource->api->createLib    = 'createLib';
 $lang->resource->api->editLib      = 'editLib';
 $lang->resource->api->deleteLib    = 'deleteLib';
 $lang->resource->api->publish      = 'publish';
-$lang->resource->api->editPublic   = 'editPublish';
+$lang->resource->api->editPublish  = 'editPublish';
 $lang->resource->api->struct       = 'struct';
 $lang->resource->api->createStruct = 'createStruct';
 $lang->resource->api->editStruct   = 'editStruct';