From 672b400f50ad00e90616e47e785c48264baeb653 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 1 Dec 2021 15:12:17 +0100 Subject: [PATCH] Bug 29609: Centralized code to build the link to a biblio detail page There are 2 prefs that control the default view of biblio detail pages: IntranetBiblioDefaultView for staff and BiblioDefaultView for OPAC. There are as well viewISBD, viewLabeledMARC and viewMARC to allow/don't allow access to those page for staff members. This code need to be in a single place to avoid discrepancy. Test plan: Play with BiblioDefaultView and IntranetBiblioDefaultView and confirm that the links of biblio point to the correct view. Signed-off-by: Martin Renvoize --- C4/Auth.pm | 2 -- basket/basket.pl | 9 -------- .../value_builder/marc21_linking_section.pl | 2 -- .../value_builder/unimarc_field_4XX.pl | 3 --- circ/pendingreserves.pl | 1 - .../prog/en/includes/biblio-title.inc | 12 ++-------- .../prog/en/includes/html_helpers.inc | 13 +++++++++++ .../modules/acqui/neworderempty_duplicate.tt | 5 +---- .../prog/en/modules/catalogue/results.tt | 15 +++---------- .../prog/en/modules/cataloguing/addbiblio.tt | 20 +++-------------- .../prog/en/modules/cataloguing/moveitem.tt | 6 ++--- .../prog/en/modules/reports/cat_issues_top.tt | 7 +----- .../prog/en/modules/serials/serials-edit.tt | 2 +- .../en/modules/serials/subscription-detail.tt | 2 +- .../bootstrap/en/includes/html_helpers.inc | 11 ++++++++++ .../bootstrap/en/modules/opac-basket.tt | 2 +- .../bootstrap/en/modules/opac-imageviewer.tt | 22 ++++--------------- .../bootstrap/en/modules/opac-opensearch.tt | 10 ++------- .../en/modules/opac-readingrecord.tt | 8 +------ .../bootstrap/en/modules/opac-shelves.tt | 10 +-------- .../bootstrap/en/modules/opac-showreviews.tt | 22 +++---------------- opac/opac-basket.pl | 9 -------- serials/checkexpiration.pl | 1 - serials/serials-edit.pl | 17 -------------- serials/subscription-detail.pl | 18 --------------- 25 files changed, 51 insertions(+), 178 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 1cfeed48cc..5f9566eaa2 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -481,7 +481,6 @@ sub get_template_and_user { my $minPasswordLength = C4::Context->preference('minPasswordLength'); $minPasswordLength = 3 if not $minPasswordLength or $minPasswordLength < 3; $template->param( - "BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1, EnhancedMessagingPreferences => C4::Context->preference('EnhancedMessagingPreferences'), GoogleJackets => C4::Context->preference("GoogleJackets"), OpenLibraryCovers => C4::Context->preference("OpenLibraryCovers"), @@ -503,7 +502,6 @@ sub get_template_and_user { $template->param( AmazonCoverImages => C4::Context->preference("AmazonCoverImages"), AutoLocation => C4::Context->preference("AutoLocation"), - "BiblioDefaultView" . C4::Context->preference("IntranetBiblioDefaultView") => 1, PatronAutoComplete => C4::Context->preference("PatronAutoComplete"), FRBRizeEditions => C4::Context->preference("FRBRizeEditions"), IndependentBranches => C4::Context->preference("IndependentBranches"), diff --git a/basket/basket.pl b/basket/basket.pl index 80a30ecee5..af74865139 100755 --- a/basket/basket.pl +++ b/basket/basket.pl @@ -108,15 +108,6 @@ foreach my $biblionumber ( @bibs ) { $dat->{MARCURLS} = $marcurlsarray; $dat->{HASAUTHORS} = $hasauthors; - if ( C4::Context->preference("IntranetBiblioDefaultView") eq "normal" ) { - $dat->{dest} = "/cgi-bin/koha/catalogue/detail.pl"; - } - elsif ( C4::Context->preference("IntranetBiblioDefaultView") eq "marc" ) { - $dat->{dest} = "/cgi-bin/koha/catalogue/MARCdetail.pl"; - } - else { - $dat->{dest} = "/cgi-bin/koha/catalogue/ISBDdetail.pl"; - } push( @results, $dat ); } diff --git a/cataloguing/value_builder/marc21_linking_section.pl b/cataloguing/value_builder/marc21_linking_section.pl index 5bff56495d..ad25daecb9 100755 --- a/cataloguing/value_builder/marc21_linking_section.pl +++ b/cataloguing/value_builder/marc21_linking_section.pl @@ -255,7 +255,6 @@ my $launcher = sub { } else { $to = $from + $resultsperpage; } - my $defaultview = 'BiblioDefaultView' . C4::Context->preference('BiblioDefaultView'); # my $link="/cgi-bin/koha/cataloguing/value_builder/unimarc4XX.pl?op=do_search&q=$search_desc&resultsperpage=$resultsperpage&startfrom=$startfrom&search=$search"; # foreach my $sort (@sort_by){ @@ -285,7 +284,6 @@ my $launcher = sub { to => $to, numbers => \@numbers, search => $search, - $defaultview => 1, Search => 0 ); diff --git a/cataloguing/value_builder/unimarc_field_4XX.pl b/cataloguing/value_builder/unimarc_field_4XX.pl index 83dcaf3c8c..da6e5242e7 100755 --- a/cataloguing/value_builder/unimarc_field_4XX.pl +++ b/cataloguing/value_builder/unimarc_field_4XX.pl @@ -439,8 +439,6 @@ sub plugin { }else{ $to = $from + $resultsperpage ; } - my $defaultview = - 'BiblioDefaultView' . C4::Context->preference('BiblioDefaultView'); # my $link="/cgi-bin/koha/cataloguing/value_builder/unimarc4XX.pl?op=do_search&q=$search_desc&resultsperpage=$resultsperpage&startfrom=$startfrom&search=$search"; # foreach my $sort (@sort_by){ # $link.="&sort_by=".$sort."&"; @@ -469,7 +467,6 @@ sub plugin { to => $to, numbers => \@numbers, search => $search, - $defaultview => 1, Search => 0 ); diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl index 8ca7245b3c..db3187e9b0 100755 --- a/circ/pendingreserves.pl +++ b/circ/pendingreserves.pl @@ -298,7 +298,6 @@ $template->param( from => $startdate, to => $enddate, holds_info => \@holds_info, - "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1, HoldsToPullStartDate => C4::Context->preference('HoldsToPullStartDate') || PULL_INTERVAL, HoldsToPullEndDate => C4::Context->preference('ConfirmFutureHolds') || 0, messages => \@messages, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc index a714f4ca80..f3c79154e3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-title.inc @@ -1,13 +1,5 @@ [% IF ( link ) %] - [% IF ( BiblioDefaultViewmarc ) %] - - [% ELSIF ( BiblioDefaultViewlabeled_marc ) %] - - [% ELSIF ( BiblioDefaultViewisbd ) %] - - [% ELSE %] - - [% END %] + [% END %] [% IF ( biblio.title ) %] @@ -36,4 +28,4 @@ [% IF ( link ) %] -[% END %] \ No newline at end of file +[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc index 802e6621ce..16c3f4ac6e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc @@ -69,6 +69,19 @@ [% END %] [% END %] +[% BLOCK biblio_a_href -%] + [%- IF Koha.Preference('IntranetBiblioDefaultView') == 'marc' && Koha.Preference('viewMARC') -%] + [%- SET this_biblio_href = "/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=" -%] + [%- ELSIF Koha.Preference('IntranetBiblioDefaultView') == 'labeled_marc' && Koha.Preference('viewLabeledMARC') -%] + [%- SET this_biblio_href = "/cgi-bin/koha/catalogue/labeledMARCdetail.pl?biblionumber=" -%] + [%- ELSIF Koha.Preference('IntranetBiblioDefaultView') == 'isbd' && Koha.Preference('viewISBD') -%] + [%- SET this_biblio_href = "/cgi-bin/koha/catalogue/ISBDdetail.pl?biblionumber=" -%] + [%- ELSE -%] + [%- SET this_biblio_href = "/cgi-bin/koha/catalogue/detail.pl?biblionumber=" -%] + [%- END -%] + [%- this_biblio_href %][% biblionumber | url -%] +[%- END %] + [% BLOCK subfields_for_item %]
    [% FOREACH subfield IN subfields %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt index cd2beae0ce..bd9bb5d41c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tt @@ -34,10 +34,7 @@

    Duplicate warning

    -

    You selected a record from an external source that matches an existing record in your catalog: [% IF ( BiblioDefaultViewmarc ) %] -[% ELSIF ( BiblioDefaultViewlabeled_marc ) %] -[% ELSIF ( BiblioDefaultViewisbd ) %] -[% ELSE %][% END %] [% duplicatetitle | html %]

    +

    You selected a record from an external source that matches an existing record in your catalog: [% duplicatetitle | html %]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 4115ddacf7..c910393ba5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -7,15 +7,6 @@ [% PROCESS 'i18n.inc' %] [% SET footerjs = 1 %] [% USE AuthorisedValues %] -[% IF BiblioDefaultViewmarc %] - [% SET DetailPage="MARCdetail.pl" %] -[% ELSIF BiblioDefaultViewlabeled_marc %] - [% SET DetailPage="labeledMARCdetail.pl" %] -[% ELSIF BiblioDefaultViewisbd %] - [% SET DetailPage="ISBDdetail.pl" %] -[% ELSE %] - [% SET DetailPage="detail.pl" %] -[% END %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( searchdesc ) %]Results of search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %] › Catalog › Koha @@ -438,7 +429,7 @@
    [% IF ( LocalCoverImages ) %][% SEARCH_RESULT.localimage | html %]
    - + 'p1'> Local cover image
    Local cover image
    @@ -447,7 +438,7 @@ [% IF ( AmazonCoverImages && SEARCH_RESULT.normalized_isbn ) %]
    - + 'p1'> Cover image from Amazon.com
    Amazon cover image
    @@ -458,7 +449,7 @@ [% coce_id = SEARCH_RESULT.normalized_ean || SEARCH_RESULT.normalized_isbn %] [% IF ( coce_id ) %]
    - + 'p1'>
    Coce cover image
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 5325d6e91f..c6cc41a7b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -928,23 +928,9 @@ function PopupMARCFieldDoc(field) {
    [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %] [% IF (biblionumber) %] - [% IF ( BiblioDefaultViewmarc ) %] -
    - Cancel -
    - [% ELSIF ( BiblioDefaultViewlabeled_marc ) %] -
    - Cancel -
    - [% ELSIF ( BiblioDefaultViewisbd ) %] -
    - Cancel -
    - [% ELSE %] -
    - Cancel -
    - [% END %] +
    + Cancel +
    [% ELSE %]
    Cancel diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt index 784034b5fd..edca69b821 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/moveitem.tt @@ -31,11 +31,11 @@
    [% BLOCK actions %] - [% IF ( BiblioDefaultViewmarc ) %] + [% IF Koha.Preference('IntranetBiblioDefaultView') == 'marc' %]
    - [% ELSIF ( BiblioDefaultViewlabeled_marc ) %] + [% IF Koha.Preference('IntranetBiblioDefaultView') == 'labeled_marc' %] - [% ELSIF ( BiblioDefaultViewisbd ) %] + [% IF Koha.Preference('IntranetBiblioDefaultView') == 'isbd' %] [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt index 96bb85d177..0b82834f33 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt @@ -71,12 +71,7 @@ [% IF ( loopcel.reference ) %] -[% IF ( loopcel.BiblioDefaultViewmarc ) %] - -[% ELSIF ( loopcel.BiblioDefaultViewisbd ) %] - -[% ELSE %] - + [% END %] [% END %] [% IF ( loopcel.value ) %][% loopcel.value | html %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index 642dd2cc5e..20c24486a9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -471,7 +471,7 @@ $(document).ready(function() { [% END %] [% END %] [% END %] -
  1. Show biblio
    2. +
  2. Show biblio
    3. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index 2ec7fefd52..184afcc1a8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -111,7 +111,7 @@
  3. Subscription ID: [% subscriptionid | html %]
  4. Librarian identity: [% librarian | html %]
  5. Vendor: [% aqbooksellername | html %]
    6. -
  6. Biblio: [% bibliotitle | html %] ([% bibnum | html %])
    7. +
  7. Biblio: [% bibliotitle | html %] ([% bibnum | html %])
    8. [% IF ( OPACBaseURL ) %]
  8. OPAC view: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc index 7a964de596..f483abba75 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/html_helpers.inc @@ -22,3 +22,14 @@
    9. [% END %] [% END %] + +[% BLOCK biblio_a_href -%] + [%- IF Koha.Preference('BiblioDefaultView') == 'marc' -%] + [%- SET this_biblio_href = "/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=" -%] + [%- ELSIF Koha.Preference('BiblioDefaultView') == 'isbd' -%] + [%- SET this_biblio_href = "/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=" -%] + [%- ELSE -%] + [%- SET this_biblio_href = "/cgi-bin/koha/opac-detail.pl?biblionumber=" -%] + [%- END -%] + [%- this_biblio_href %][% biblionumber | url -%] +[%- END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt index 5c3e6beaa9..4e6219c0bd 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt @@ -286,7 +286,7 @@ - [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT %] + [% INCLUDE 'biblio-title.inc' biblio=BIBLIO_RESULT %] [% IF ( TagsInputEnabled && loggedinusername ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt index d968ce98e0..36d4d51eb4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt @@ -45,15 +45,8 @@ Home
  9. - [% IF ( BiblioDefaultViewmarc ) %] - - [% ELSE %] - [% IF ( BiblioDefaultViewisbd ) %] - - [% ELSE %] - - [% END %] - [% END %][% INCLUDE 'biblio-title.inc' %] + + [% INCLUDE 'biblio-title.inc' %]
  10. Images @@ -77,15 +70,8 @@

    Images for - [% IF ( BiblioDefaultViewmarc ) %] - - [% ELSE %] - [% IF ( BiblioDefaultViewisbd ) %] - - [% ELSE %] - - [% END %] - [% END %][% INCLUDE 'biblio-title.inc' %] [% biblio.author | html %] + + [% INCLUDE 'biblio-title.inc' %] [% biblio.author | html %]

    diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt index de69346dc4..798c724c7d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt @@ -42,13 +42,7 @@ [% INCLUDE 'biblio-title-head.inc' biblio=SEARCH_RESULT %] ISBN:[% SEARCH_RESULT.isbn | html %] - [% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %] - [% OPACBaseURL | url %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %] - [% ELSIF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %] - [% OPACBaseURL | url %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %] - [% ELSE %] - [% OPACBaseURL | url %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | uri %] - [% END %] + [% OPACBaseURL | url %][% PROCESS biblio_a_href biblionumber => SEARCH_RESULT.biblionumber %] [% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %] @@ -116,7 +110,7 @@ [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %] [% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %] - [% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% END %][% END %] + [% OPACBaseURL | url %][% PROCESS biblio_a_href biblionumber => SEARCH_RESULT.biblionumber %] [% SEARCH_RESULT.timestamp | html %] [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt index 54290b47e6..6860faca33 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -139,13 +139,7 @@ [% END %] - [% IF issue.BiblioDefaultViewmarc %] - [% INCLUDE 'biblio-title.inc' biblio=issue %] - [% ELSIF issue.BiblioDefaultViewisbd %] - [% INCLUDE 'biblio-title.inc' biblio=issue %] - [% ELSE %] - [% INCLUDE 'biblio-title.inc' biblio=issue %] - [% END %] + [% INCLUDE 'biblio-title.inc' biblio=issue, link => 1 %]

    [% issue.author | html %]

    [% IF ( Koha.Preference( 'OpacStarRatings' ) == 'all' ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index 615fc44990..d2b95e5777 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -463,15 +463,7 @@ [% IF Koha.Preference('OPACCustomCoverImages') AND Koha.Preference('CustomCoverImagesURL') %] [% SET custom_cover_image_url = itemsloo.biblio_object.custom_cover_image_url %] [% IF custom_cover_image_url %] - [% IF ( itemsloo.BiblioDefaultViewmarc ) %] - - [% ELSE %] - [% IF ( itemsloo.BiblioDefaultViewisbd ) %] - - [% ELSE %] - - [% END %] - [% END %] + Cover image [% END %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt index c0a4c518f1..dbcdbf421e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt @@ -44,16 +44,8 @@

    - [% IF ( BiblioDefaultViewmarc ) %] - - [% ELSE %] - [% IF ( BiblioDefaultViewisbd ) %] - - [% ELSE %] - - [% END %] - [% END %] - [% INCLUDE 'biblio-title.inc' biblio=review %] + + [% INCLUDE 'biblio-title.inc' biblio=review %] [% IF ( review.author ) %] by [% review.author | html %] @@ -118,15 +110,7 @@

    - [% IF ( review.BiblioDefaultViewmarc ) %] - - [% ELSE %] - [% IF ( review.BiblioDefaultViewisbd ) %] - - [% ELSE %] - - [% END %] - [% END %] + [% IF ( OPACAmazonCoverImages ) %] [% IF ( review.normalized_isbn ) %] diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl index ef137b95b0..1cea0e5756 100755 --- a/opac/opac-basket.pl +++ b/opac/opac-basket.pl @@ -159,15 +159,6 @@ foreach my $biblionumber ( @bibs ) { $dat->{MARCURLS} = $marcurlsarray; $dat->{HASAUTHORS} = $hasauthors; - if ( C4::Context->preference("BiblioDefaultView") eq "normal" ) { - $dat->{dest} = "opac-detail.pl"; - } - elsif ( C4::Context->preference("BiblioDefaultView") eq "marc" ) { - $dat->{dest} = "opac-MARCdetail.pl"; - } - else { - $dat->{dest} = "opac-ISBDdetail.pl"; - } push( @results, $dat ); } diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl index 6ce76af267..e253f1876b 100755 --- a/serials/checkexpiration.pl +++ b/serials/checkexpiration.pl @@ -108,7 +108,6 @@ if ($date) { numsubscription => scalar @subscriptions_loop, date => $date, subscriptions_loop => \@subscriptions_loop, - "BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1, searched => 1, ); } diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl index 8c5720e88f..2b7f17103e 100755 --- a/serials/serials-edit.pl +++ b/serials/serials-edit.pl @@ -425,7 +425,6 @@ if ( $op and $op eq 'serialchangestatus' ) { } } my $location = $serialdatalist[0]->{'location'}; -my $default_bib_view = get_default_view(); $template->param( subscriptionid => $serialdatalist[0]->{subscriptionid}, @@ -435,24 +434,8 @@ $template->param( bibliotitle => $biblio->title, biblionumber => $serialdatalist[0]->{'biblionumber'}, serialslist => \@serialdatalist, - default_bib_view => $default_bib_view, location => $location, (uc(C4::Context->preference("marcflavour"))) => 1 ); output_html_with_http_headers $query, $cookie, $template->output; - -sub get_default_view { - my $defaultview = C4::Context->preference('IntranetBiblioDefaultView'); - my %views = C4::Search::enabled_staff_search_views(); - if ( $defaultview eq 'isbd' && $views{can_view_ISBD} ) { - return 'ISBDdetail'; - } - elsif ( $defaultview eq 'marc' && $views{can_view_MARC} ) { - return 'MARCdetail'; - } - elsif ( $defaultview eq 'labeled_marc' && $views{can_view_labeledMARC} ) { - return 'labeledMARCdetail'; - } - return 'detail'; -} diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl index 6e8204810f..7cae3806e7 100755 --- a/serials/subscription-detail.pl +++ b/serials/subscription-detail.pl @@ -122,8 +122,6 @@ my @irregular_issues = split /;/, $subs->{irregularity}; my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subs->{periodicity}); my $numberpattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subs->{numberpattern}); -my $default_bib_view = get_default_view(); - my $subscription_object = Koha::Subscriptions->find( $subscriptionid ); $template->param( available_additional_fields => [ Koha::AdditionalFields->search( { tablename => 'subscription' } ) ], @@ -165,25 +163,9 @@ $template->param( intranetstylesheet => C4::Context->preference('intranetstylesheet'), intranetcolorstylesheet => C4::Context->preference('intranetcolorstylesheet'), irregular_issues => scalar @irregular_issues, - default_bib_view => $default_bib_view, orders_grouped => $orders_grouped, (uc(C4::Context->preference("marcflavour"))) => 1, mana_comments => $subs->{comments}, ); output_html_with_http_headers $query, $cookie, $template->output; - -sub get_default_view { - my $defaultview = C4::Context->preference('IntranetBiblioDefaultView'); - my %views = C4::Search::enabled_staff_search_views(); - if ( $defaultview eq 'isbd' && $views{can_view_ISBD} ) { - return 'ISBDdetail'; - } - elsif ( $defaultview eq 'marc' && $views{can_view_MARC} ) { - return 'MARCdetail'; - } - elsif ( $defaultview eq 'labeled_marc' && $views{can_view_labeledMARC} ) { - return 'labeledMARCdetail'; - } - return 'detail'; -} -- 2.20.1