From 662fb8c10d4a570965fc666e51956cc891c7b1b8 Mon Sep 17 00:00:00 2001 From: Agustin Moyano Date: Tue, 31 Mar 2020 21:36:02 +0000 Subject: [PATCH] Bug 20936: (follow-up) change opac-holdsrecord to opac-holdshistory, set translatable strings and set rows per page to 20 --- .../opac-tmpl/bootstrap/en/includes/usermenu.inc | 2 +- .../{opac-holdsrecord.tt => opac-holdshistory.tt} | 15 ++++++++------- .../{opac-holdsrecord.pl => opac-holdshistory.pl} | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) rename koha-tmpl/opac-tmpl/bootstrap/en/modules/{opac-holdsrecord.tt => opac-holdshistory.tt} (95%) rename opac/{opac-holdsrecord.pl => opac-holdshistory.pl} (96%) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc index 7f06967756..268a5d86f2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc @@ -73,7 +73,7 @@ [% ELSE %]
  • [% END %] - your holds history
  • + your holds history [% END %] [% IF ( OPACPrivacy || Koha.Preference('OPACHoldsPrivacy') == 1 ) %] [% IF ( privacyview ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdsrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt similarity index 95% rename from koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdsrecord.tt rename to koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt index ec997f75d5..b8e01b2ac7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdsrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt @@ -35,7 +35,7 @@ [% END %] -[% INCLUDE 'bodytag.inc' bodyid='opac-holdsrecord' %] +[% INCLUDE 'bodytag.inc' bodyid='opac-holdshistory' %] [% INCLUDE 'masthead.inc' %]
    @@ -53,7 +53,7 @@
    -
    +

    Holds history

    [% IF READING_RECORD.size == 0 %] @@ -133,6 +133,7 @@ "biblio", "branch" ], + 'pageLength': 20, 'order': [[ 4, "desc" ]], "columnDefs": [ { "targets": [ "nosort" ],"sortable": false,"searchable": false }, @@ -184,11 +185,11 @@ "data": "status", "render": function(data, type, row, meta) { if (type != 'display') return data; - if(row.cancelation_date) return 'Canceled'; - if (data == 'F') return 'Fulfilled'; - if (data == 'W') return 'Waiting'; - if (data == 'T') return 'In Transit'; - return 'Pending'; + if(row.cancelation_date) return _('Canceled'); + if (data == 'F') return _('Fulfilled'); + if (data == 'W') return _('Waiting'); + if (data == 'T') return _('In Transit'); + return _('Pending'); } } ] diff --git a/opac/opac-holdsrecord.pl b/opac/opac-holdshistory.pl similarity index 96% rename from opac/opac-holdsrecord.pl rename to opac/opac-holdshistory.pl index c9a2d83ded..91b03a449c 100755 --- a/opac/opac-holdsrecord.pl +++ b/opac/opac-holdshistory.pl @@ -45,7 +45,7 @@ if ( ! C4::Context->preference('OPACHoldsHistory') ) { my ( $template, $borrowernumber, $cookie ) = get_template_and_user( { - template_name => "opac-holdsrecord.tt", + template_name => "opac-holdshistory.tt", query => $query, type => "opac", debug => 1, -- 2.25.0