From ae7579f8751c654b12ffa3477bc3fde1f9eb8fae Mon Sep 17 00:00:00 2001 From: Didier Gautheron Date: Tue, 15 Dec 2020 12:04:40 +0100 Subject: [PATCH] Bug 27239: Detail templates remove redundant test Template variables FRBRizeEditions and OPACFRBRizeEditions aren't assigned with syspref values and are redundant anyway. If syspref FRBRizeEditions or OPACFRBRizeEditions aren't set XISBN is empty. Test plan: 1 - Set Sysprefs ThingISBN, FRBRizeEditions and OPACFRBRizeEditions 2 - Search for a notice with multiple ISBN in ThingISBN and with some of these ISBNs in Koha. Example: http://www.librarything.com/api/thingISBN/0452254264 In koha imported from LOC ISBN: 0452254264 0198185219 3 - Select one notice 4 - Edition tab is not there. 5 - Apply patch 6 - Redo 2 7 - Edition tab is there. 8 - Unset FRBRizeEditions and OPACFRBRizeEditions 9 - Edition tab isn't there. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 90000082c5..2204097aa0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -268,7 +268,7 @@ [% IF ( subscriptionsnumber ) %]
  • Subscriptions
  • [% END %] [% IF Koha.Preference('AcquisitionDetails') %]
  • Acquisition details
  • [% END %] [% IF suggestions.count %]
  • Suggestion details
  • [% END %] -[% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]
  • Editions
  • [% END %][% END %] +[% IF ( XISBNS ) %]
  • Editions
  • [% END %] [% IF ( LocalCoverImages ) %] [% IF ( localimages.count || CAN_user_tools_upload_local_cover_images ) %]
  • @@ -881,7 +881,7 @@ Note that permanent location is a code, and location may be an authval. [% END %] -[% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %] +[% IF ( XISBNS ) %]

    Editions

    [% FOREACH XISBN IN XISBNS %][% IF ( AmazonCoverImages ) %][% END %] @@ -895,7 +895,7 @@ Note that permanent location is a code, and location may be an authval. [% END %] -
    [% END %] + [% END %] [% IF ( LocalCoverImages ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index 6adf406504..f04454c839 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -571,7 +571,7 @@ [% END %] [% END %] - [% IF ( OPACFRBRizeEditions && XISBNS ) %] + [% IF XISBNS %]
  • Editions
  • [% END %] @@ -956,7 +956,7 @@ [% END # / IF OPACComments %] - [% IF ( OPACFRBRizeEditions && XISBNS ) %] + [% IF XISBNS %]

    Other editions of this work

    @@ -995,7 +995,7 @@ [% END # / FOREACH XISBNS %]
    - [% END # / IF OPACFRBRizeEditions && XISBNS %] + [% END # / IF XISBNS %] [% IF ( HTML5MediaEnabled ) %]
    -- 2.11.0