[open-ils-commits] [GIT] Evergreen ILS branch rel_3_1 updated. 43865ff4e96ee4c8132005b400b4e96ac8cd1e28

[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_3_1 has been updated
       via  43865ff4e96ee4c8132005b400b4e96ac8cd1e28 (commit)
      from  f90c1afec5aca3efc13c7efcbc19f070c9a4f7bf (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 43865ff4e96ee4c8132005b400b4e96ac8cd1e28
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Mon Apr 30 22:45:48 2018 -0400

    LP#1732591: (follow-up) fix major regressions
    
    This patch works around two regressions introduced by a previous patch:
    
    - record links from titles on the OPAC results page simply re-ran
      the search
    - record links from cover images on the OPAC results page dropped
      all paramters
    
    In one case, a 'record_url' should have been a mkurl() expression. In the
    other case, the prior patch did not handle the clear_params parameter
    correctly; an empty array is /not/ equivalent to undef, and all CGI parameters
    were getting cleared.
    
    This patch is offered in lieu of simply pushing a revert.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 7063612..d28e8ec 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -64,13 +64,13 @@
                                     # this case, only, record
                                     record_url_path = ctx.opac_root _ '/record/' _ attrs.mr_constituent_ids.0;
                                     add_parms = { badges => rec.badges.join(',') };
-                                    del_parms = [];
+                                    del_parms = ['quux'];
                                 END;
                                 hold_type = 'M';
                             ELSE;
                                 record_url_path = ctx.opac_root _ '/record/' _ rec.bre_id; 
                                 add_parms = { badges => rec.badges.join(',') };
-                                del_parms = [];
+                                del_parms = ['quux'];
                                 hold_type = 'T';
                             END;
 
@@ -105,7 +105,7 @@
                                                     </abbr>
                                                     [% END %]
                                                     <a class='record_title search_link' name='record_[% rec.id %]'
-                                                        href="[% record_url %]"
+                                                        href="[% mkurl(record_url_path, add_parms, del_parms); %]"
                                                         [% html_text_attr('title', l('Display record details for "[_1]"', attrs.title)) %]>
                                                         [% IF attrs.hl.title; attrs.hl.title; ELSE; attrs.title | html; END %]
                                                      </a>

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

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


hooks/post-receive
-- 
Evergreen ILS