From 3fd72b440ae5cf3dfdd2995d4de3eb3f4ed3c855 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 13 Mar 2020 18:03:12 +0000 Subject: [PATCH] Bug 24837: Rename selectbranchprinter.pl to set-library.pl This renames the selectbranchprinter.pl file to the more fitting set-library.pl. To test: - Change the library with "Set library" from - The menu in the top navigation bar - The circulation start page - Verify the help link on page leads to the correct section in the manual - Read the code... and verify all occurences have been caught Signed-off-by: Bernardo Gonzalez Kriegel Works ok, fixed tab char in circ/branchtransfers.pl Signed-off-by: Jonathan Druart --- Koha/Manual.pm | 2 +- circ/branchtransfers.pl | 2 +- circ/{selectbranchprinter.pl => set-library.pl} | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/header.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/patroncards-errors.inc | 4 ++-- .../intranet-tmpl/prog/en/modules/circ/circulation-home.tt | 2 +- .../modules/circ/{selectbranchprinter.tt => set-library.tt} | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) rename circ/{selectbranchprinter.pl => set-library.pl} (95%) rename koha-tmpl/intranet-tmpl/prog/en/modules/circ/{selectbranchprinter.tt => set-library.tt} (94%) diff --git a/Koha/Manual.pm b/Koha/Manual.pm index 966a723897..3c1e45f206 100644 --- a/Koha/Manual.pm +++ b/Koha/Manual.pm @@ -123,7 +123,7 @@ our $mapping = { 'circ/renew' => '/circulation.html#renewing', 'circ/reserveratios' => '/circulation.html#hold-ratios', 'circ/returns' => '/circulation.html#check-in-returning', - 'circ/selectbranchprinter' => '/circulation.html#set-library', + 'circ/set-library' => '/circulation.html#set-library', 'circ/transferstoreceive' => '/circulation.html#transfers-to-receive', 'circ/view_holdsqueue' => '/circulation.html#holds-queue', 'circ/waitingreserves' => '/circulation.html#holds-awaiting-pickup', diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl index ea9b289d32..4ed1fb3c34 100755 --- a/circ/branchtransfers.pl +++ b/circ/branchtransfers.pl @@ -47,7 +47,7 @@ if (!C4::Context->userenv){ $session = get_session($sessionID) if $sessionID; if (!$session){ # no branch set we can't transfer - print $query->redirect("/cgi-bin/koha/circ/selectbranchprinter.pl"); + print $query->redirect("/cgi-bin/koha/circ/set-library.pl"); exit; } } diff --git a/circ/selectbranchprinter.pl b/circ/set-library.pl similarity index 95% rename from circ/selectbranchprinter.pl rename to circ/set-library.pl index c762876cb0..375a7f7809 100755 --- a/circ/selectbranchprinter.pl +++ b/circ/set-library.pl @@ -30,7 +30,7 @@ use Koha::Libraries; my $query = CGI->new(); my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user({ - template_name => "circ/selectbranchprinter.tt", + template_name => "circ/set-library.tt", query => $query, type => "intranet", debug => 1, @@ -77,7 +77,7 @@ foreach ($query->param()) { } my $referer = $query->param('oldreferer') || $ENV{HTTP_REFERER}; -$referer =~ /selectbranchprinter\.pl/ and undef $referer; # avoid sending them back to this same page. +$referer =~ /set-library\.pl/ and undef $referer; # avoid sending them back to this same page. if (scalar @updated and not scalar @recycle_loop) { # we updated something, and there were no extra params to POST: quick redirect diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc index 708ff33e04..979871a0b9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-nav.inc @@ -15,7 +15,7 @@
  • Transfer
    • [% END %] [% IF ( AutoLocation ) %][% ELSE %][% IF ( IndependentBranches ) %][% ELSE %] -
  • Set library
    • +
  • Set library
    • [% END %][% END %] [% IF ( fast_cataloging ) %][% IF ( CAN_user_editcatalogue_fast_cataloging ) %]
  • Fast cataloging
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 6b4452641a..868b22a418 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -110,12 +110,12 @@ [% IF ( IndependentBranches ) %] [% IF ( CAN_user_editcatalogue_edit_catalogue ) %]
  • - Set library + Set library
    • [% END %] [% ELSE %]
  • - Set library + Set library
    • [% END %] [% IF EnableSearchHistory %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc index 84e4adc2ad..3c987d705e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patroncards-errors.inc @@ -32,7 +32,7 @@ [% ELSIF ( error == 202 ) %] An error has occurred. [% INCLUDE asksysadmin %] [% ELSIF ( error == 203 ) %] - A non-existent or invalid library code was supplied. Please verify that you have a library set. Set library + A non-existent or invalid library code was supplied. Please verify that you have a library set. Set library [% ELSIF ( error == 301 ) %] An error has occurred while attempting to upload the image file. [% INCLUDE asksysadmin %] [% ELSIF ( error == 302 ) %] @@ -44,7 +44,7 @@ [% ELSIF ( error == 401 ) %] An error has occurred and no items have been added to batch [% batch_id | html %]. [% INCLUDE asksysadmin %] [% ELSIF ( error == 402 ) %] - No items added because the library is not set. Please set your library before adding items to a batch. Set library + No items added because the library is not set. Please set your library before adding items to a batch. Set library [% ELSIF ( error == 403 ) %] An error has occurred and the item(s) was not removed from batch [% batch_id | html %]. [% INCLUDE asksysadmin %] [% ELSIF ( error == 404 ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt index b1bac4ae2b..fbabec6745 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt @@ -30,7 +30,7 @@ [% UNLESS IndependentBranches %]
  • - Set library + Set library
    • [% END %] [% IF ( fast_cataloging ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt similarity index 94% rename from koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt rename to koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt index 19d462c273..325b17eb9f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt @@ -7,14 +7,14 @@ .noshow {display: none;} - + [% INCLUDE 'header.inc' %] [% INCLUDE 'circ-search.inc' %]
    @@ -53,7 +53,7 @@ Updated:
      [% ELSE %] -
      +
      Set library
        -- 2.20.1