From b041a326c222716474d912012125b42ecc2917bc Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 19 Oct 2022 14:25:49 +0100 Subject: [PATCH] Bug 31028: Move back to cataloging from tools --- koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc | 7 ++++++- koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc | 3 --- .../prog/en/modules/cataloguing/cataloging-home.tt | 8 +++++++- .../intranet-tmpl/prog/en/modules/cataloguing/concerns.tt | 2 +- .../intranet-tmpl/prog/en/modules/tools/tools-home.tt | 5 ----- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc index 2bd37f8fc9..f08c10e128 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-menu.inc @@ -29,7 +29,7 @@ [% END %] - [% IF ( CAN_user_tools_inventory ) %] + [% IF ( CAN_user_tools_inventory || ( ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue ) ) %]
Reports
[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc index 766139a10a..4653fe13e9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc @@ -49,9 +49,6 @@ [% IF ( CAN_user_tools_rotating_collections ) %]
  • Rotating collections
  • [% END %] - [% IF ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue %] -
  • Catalog concerns
  • - [% END %] [% END # /IF ( CAN_user_tools_items_batchdel... %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt index 70c1a82214..f291219f98 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/cataloging-home.tt @@ -91,7 +91,7 @@ [% END %] - [% IF ( CAN_user_tools_inventory ) %] + [% IF ( CAN_user_tools_inventory || ( ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue ) ) %]

    Reports

    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt index 79a183389e..51ec30ff4a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt @@ -19,7 +19,7 @@ Home
  • - Tools + Cataloging
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt index 6ffdf522da..73508b2c64 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt @@ -110,11 +110,6 @@
    Rotating collections
    Manage rotating collections
    [% END %] - - [% IF ( Koha.Preference('CatalogConcerns') || Koha.Preference('OpacCatalogConcerns') ) && CAN_user_editcatalogue_edit_catalogue %] -
    Catalog concerns
    -
    Manage catalog concern reports
    - [% END %] -- 2.20.1