[open-ils-commits] [GIT] Evergreen ILS branch rel_2_11 updated. 0830611fec2a055209759a17fc42ef24ba5499d9

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_11 has been updated
       via  0830611fec2a055209759a17fc42ef24ba5499d9 (commit)
      from  6fccc214d274efe5f8cb947e1c0ba1672245112b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0830611fec2a055209759a17fc42ef24ba5499d9
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Fri Jan 6 11:13:26 2017 -0500

    LP#1654534: Prevent loop that occurs when staff us 'place another hold' link
    
    A hidden field that tracked the page the user was on before placing a hold was
    inadvertently removed in another bug fix. As a result, if staff used the link
    to place another hold on the same title, they were stuck in a loop where they
    couldn't return to the source page after hitting the 'continue' button. This
    commit restores that hidden field.
    
    Also provides a fix so that hold labels used in the place another hold link
    can be translated.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Ben Shum <ben at evergreener.net>

diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2
index c4f197d..8b898d8 100644
--- a/Open-ILS/src/templates/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2
@@ -31,6 +31,7 @@
             redirect = redirect.replace('^http:', 'https:') 
         %]
         <input type="hidden" name="redirect_to" value="[% redirect | html %]" />
+        <input type="hidden" name="hold_source_page" value="[% CGI.param('hold_source_page') | html %]" />
         [%
             usr_barcode = CGI.param('usr_barcode') | html;
             is_requestor = CGI.param('is_requestor');
diff --git a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2 b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
index 889f411..d158e86 100644
--- a/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold_result.tt2
@@ -136,11 +136,11 @@
           <span><a href="[% CGI.param('redirect_to') || CGI.referer | html %]">[% l('Continue') %]</a></span>
            [% IF ctx.is_staff %]
              [% IF CGI.param('hold_type') == 'C';
-                  hold_type_label = 'copy';
+                  hold_type_label = l('copy');
                 ELSIF CGI.param('hold_type') == 'V';
-                  hold_type_label = 'volume';
+                  hold_type_label = l('volume');
                 ELSE;
-                  hold_type_label = 'title';
+                  hold_type_label = l('title');
               END %]
                <span><a href="[% mkurl(ctx.opac_root _ '/place_hold', {hold_source_page => CGI.param('hold_source_page'), bre_id => CGI.param('bre_id')}) %]">
                [% l('Place another hold for this ') %] [% hold_type_label %]</a>

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/opac/parts/place_hold.tt2   |    1 +
 .../src/templates/opac/parts/place_hold_result.tt2 |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS