From cfaea6c602a95eff5a17bea4930ce08bf27eec07 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 19 Oct 2021 17:59:36 +0800 Subject: [PATCH 1/3] * Fix bug#15615. --- module/api/view/index.html.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/module/api/view/index.html.php b/module/api/view/index.html.php index a63fce5607..d8c8c2f403 100644 --- a/module/api/view/index.html.php +++ b/module/api/view/index.html.php @@ -25,19 +25,22 @@ echo "
"; echo html::a('javascript:;', "", '', "data-toggle='dropdown' class='btn btn-link'"); echo "
'; } From b70e00dbad3ade8c9a801ae1812f2322048ef064 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 19 Oct 2021 18:14:27 +0800 Subject: [PATCH 2/3] * Adjust code style. --- module/api/view/index.html.php | 49 +++++++++++++++++----------------- 1 file changed, 24 insertions(+), 25 deletions(-) diff --git a/module/api/view/index.html.php b/module/api/view/index.html.php index d8c8c2f403..fbb9c6fb60 100644 --- a/module/api/view/index.html.php +++ b/module/api/view/index.html.php @@ -22,27 +22,27 @@ "; - echo html::a('javascript:;', "", '', "data-toggle='dropdown' class='btn btn-link'"); - echo "'; + echo "
"; + echo html::a('javascript:;', "", '', "data-toggle='dropdown' class='btn btn-link'"); + echo "
    "; + if(common::hasPriv('tree', 'browse')) + { + echo '
  • ' . html::a($this->createLink('tree', 'browse', "rootID=$libID&view=api", '', true), ' ' . $this->lang->api->manageType, '', "class='iframe'") . '
    • '; + } + if(common::hasPriv('api', 'publish')) + { + echo '
  • ' . html::a($this->createLink('api', 'editPublish', "libID=$libID", '', true), ' ' . $this->lang->api->managePublish, '', "class='iframe'") . '
    • '; + } + echo "
  • "; + if(common::hasPriv('api', 'createLib')) + { + echo '
  • ' . html::a($this->createLink('api', 'editLib', "rootID=$libID"), ' ' . $lang->api->editLib, '', "class='iframe'") . '
    • '; + } + if(common::hasPriv('api', 'deleteLib')) + { + echo '
  • ' . html::a($this->createLink('api', 'deleteLib', "rootID=$libID"), ' ' . $lang->api->deleteLib, 'hiddenwin') . '
    • '; + } + echo '
'; } ?> @@ -64,19 +64,18 @@
  • 0 ? $lang->api->apiList : $lang->api->title;?>
    • -
    -
    +
    api->noLib : $lang->api->noApi;?>
    ' . $lang->api->createApi, '', 'class="btn btn-info btn-wide"'); + $html = html::a(helper::createLink('api', 'create', "libID={$libID}"), ' ' . $lang->api->createApi, '', 'class="btn btn-info btn-wide"'); } else { - $html = html::a(helper::createLink('api', 'createLib'), ' ' . $lang->api->createLib, '', 'class="btn btn-info btn-wide iframe"'); + $html = html::a(helper::createLink('api', 'createLib'), ' ' . $lang->api->createLib, '', 'class="btn btn-info btn-wide iframe"'); } echo $html; ?> From 5479e2db3fd5fe858ad1581437312486d3e1a2ed Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 19 Oct 2021 18:40:55 +0800 Subject: [PATCH 3/3] * 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 @@
  • lang->api->module;?>
    • "; echo html::a('javascript:;', "", '', "data-toggle='dropdown' class='btn btn-link'"); echo "
      "; - if(common::hasPriv('tree', 'browse')) - { - echo '
    • ' . html::a($this->createLink('tree', 'browse', "rootID=$libID&view=api", '', true), ' ' . $this->lang->api->manageType, '', "class='iframe'") . '
      • '; - } - if(common::hasPriv('api', 'publish')) - { - echo '
    • ' . html::a($this->createLink('api', 'editPublish', "libID=$libID", '', true), ' ' . $this->lang->api->managePublish, '', "class='iframe'") . '
      • '; - } + if($canTreeBrowse) echo '
    • ' . html::a($this->createLink('tree', 'browse', "rootID=$libID&view=api", '', true), ' ' . $this->lang->api->manageType, '', "class='iframe'") . '
      • '; + if($canEditPublish) echo '
    • ' . html::a($this->createLink('api', 'editPublish', "libID=$libID", '', true), ' ' . $this->lang->api->managePublish, '', "class='iframe'") . '
      • '; echo "
    • "; - if(common::hasPriv('api', 'createLib')) - { - echo '
    • ' . html::a($this->createLink('api', 'editLib', "rootID=$libID"), ' ' . $lang->api->editLib, '', "class='iframe'") . '
      • '; - } - if(common::hasPriv('api', 'deleteLib')) - { - echo '
    • ' . html::a($this->createLink('api', 'deleteLib', "rootID=$libID"), ' ' . $lang->api->deleteLib, 'hiddenwin') . '
      • '; - } + if($canEditLib) echo '
    • ' . html::a($this->createLink('api', 'editLib', "rootID=$libID"), ' ' . $lang->api->editLib, '', "class='iframe'") . '
      • '; + if($canDeleteLib) echo '
    • ' . html::a($this->createLink('api', 'deleteLib', "rootID=$libID"), ' ' . $lang->api->deleteLib, 'hiddenwin') . '
      • '; echo '
    '; } ?> 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';