From 49f20dcc5c513d6e60244a87751171c7e92782c2 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Mon, 30 Apr 2018 22:45:48 -0400
Subject: [PATCH] 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@equinoxinitiative.org>
---
 Open-ILS/src/templates/opac/parts/result/table.tt2 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 7063612fe6..d28e8ec099 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>
-- 
2.43.2