[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. 6ec8bcea7e3a1b93fd9d4627571d95483c55b635
Evergreen Git
git at git.evergreen-ils.org
Wed Nov 20 10:42:38 EST 2013
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, master has been updated
via 6ec8bcea7e3a1b93fd9d4627571d95483c55b635 (commit)
from 76580f62c306924ea7085d0a4800fe11a854f1e1 (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 6ec8bcea7e3a1b93fd9d4627571d95483c55b635
Author: Liam Whalen <whalen.ld at gmail.com>
Date: Sun Oct 6 22:11:56 2013 -0700
LP#1037171 Removed Expert Search paramters from subject links
After performing an Expert Search, if a user visits a record and then
clicks on one of the author, subject, or series search links within that
record, then they are given the results of the Expert Search again
instead of the relevant subject or author search.
This is happening because the Expert Search parameters are retained in
the URLs via the TT2 MACRO mkurl. In particular, the tag parameter is
used to identify an Expert Search, so if it is present in a URL, than an
Expert Search will be attempted regardless of which other paramaters are
in the URL.
To fix this, I created two varialbes within header.tt2 above the
definition of mkurl. These variables group common URL paramters for
Expert Searches and General Search parameters together. These variables
can be used wherever mkurl is used to strip out unneeded search
paramters.
There is a third variable that is already present within many of these
pages named stop_parms. While I initially tried to modify this
variable, I found that there are some instances where the general search
parameters should be retained while the Expert Search parameters must go.
This commit uses these three variables togehter as input into the third
arugment of the mkurl MACRO. The third arugment specifies which
paramtes to remove from the previous URL before making a new URL based
on the pervious URL.
I also added the query parameter to the Place Hold's hold_source_page
URL variable. I did this, so that the query terms would be preserved
once the user is done placing the hold or decides to cancle the placing
of the hold.
As well, I used the new variables to remove Expert Search paramters
from the Advanced Search links on the results and record pages.
Conflicts:
Open-ILS/src/templates/opac/parts/searchbar.tt2
Signed-off-by: Liam Whalen <whalen.ld at gmail.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/templates/opac/parts/header.tt2 b/Open-ILS/src/templates/opac/parts/header.tt2
index daa26e5..9a2858c 100644
--- a/Open-ILS/src/templates/opac/parts/header.tt2
+++ b/Open-ILS/src/templates/opac/parts/header.tt2
@@ -12,6 +12,10 @@
is_advanced = CGI.param("_adv").size;
is_special = CGI.param("_special").size;
+ #variables to use to remove parameters via mkurk
+ expert_search_parms = ['tag','subfield','term','_special'];
+ general_search_parms = ['page','sort','query'];
+
# -----------------------------------------------------------------------------
# mkurl( destination_page, params_to_set, params_to_clear )
#
diff --git a/Open-ILS/src/templates/opac/parts/record/authors.tt2 b/Open-ILS/src/templates/opac/parts/record/authors.tt2
index a13843d..676e0f8 100644
--- a/Open-ILS/src/templates/opac/parts/record/authors.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/authors.tt2
@@ -65,7 +65,7 @@ BLOCK build_author_links;
term = term _ ' ' _ sf;
END;
END;
- url = mkurl(ctx.opac_root _ '/results', {query => qterm, qtype => 'author'}, ['page', 'expand']);
+ url = mkurl(ctx.opac_root _ '/results', {query => qterm, qtype => 'author'}, stop_parms.merge(expert_search_parms, general_search_parms));
author_type = (tlabel || label) | html;
# schema.org changes
diff --git a/Open-ILS/src/templates/opac/parts/record/series.tt2 b/Open-ILS/src/templates/opac/parts/record/series.tt2
index 8b29b6b..9518232 100644
--- a/Open-ILS/src/templates/opac/parts/record/series.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/series.tt2
@@ -24,7 +24,7 @@ BLOCK render_series;
total_term = all_terms.join(" ").replace('\s+$', '');
url = mkurl(ctx.opac_root _ '/results',
- { qtype=>'series', query=>total_term }, stop_parms
+ { qtype=>'series', query=>total_term }, stop_parms.merge(expert_search_parms, general_search_parms)
);
series = series _ '<a href="' _ url _ '">' _ single_term _ '</a> ';
END;
diff --git a/Open-ILS/src/templates/opac/parts/record/subjects.tt2 b/Open-ILS/src/templates/opac/parts/record/subjects.tt2
index 5812690..68c421b 100644
--- a/Open-ILS/src/templates/opac/parts/record/subjects.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/subjects.tt2
@@ -47,7 +47,7 @@
all_terms.push(subfield.textContent.replace('\-', ' ').replace('[#"^$\+,\.:;&|\[\]()]', ''));
total_term = all_terms.join(" ").replace('\s+$', '');
%]
-<a href="[% mkurl(ctx.opac_root _ '/results', {qtype=>'subject', query=>total_term}, stop_parms); %]">[% single_term %]</a>
+<a href="[% mkurl(ctx.opac_root _ '/results', {qtype=>'subject', query=>total_term}, stop_parms.merge(expert_search_parms, general_search_parms)) %]">[% single_term %]</a>
[%- END;
IF all_terms.size; "<br/>"; END;
FOREACH link880 IN graphics;
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index fd1c20f..b481b5f 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -297,8 +297,8 @@ END;
)
%]
<div class="results_aux_utils place_hold"><a
- href="[% mkurl(ctx.opac_root _ '/place_hold',
- {hold_target => rec.id, hold_type => 'T', hold_source_page => mkurl()}) %]"
+ href="[% mkurl(ctx.opac_root _ '/place_hold',
+ {hold_target => rec.id, hold_type => 'T', hold_source_page => mkurl()}, ['query']) %]"
name="place_hold_link" class="no-dec"><img
src="[% ctx.media_prefix %]/images/green_check.png"
alt=""/><span class="result_place_hold">[% l('Place Hold') %]</span></a>
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index e16729f..3723099 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -5,7 +5,7 @@
[%- END %]
<div id="search-box">
<span class="search_catalog_lbl mobile_hide">[% l('Search the Catalog') %]</span>
- <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
+ <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced', {}, general_search_parms.merge(expert_search_parms)) %]"
id="home_adv_search_link">[% l('Advanced Search') %]</a></span>
<span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse', {}, ['fi:has_browse_entry']) %]">[% l('Browse the Catalog') %]</a></span>
</div>
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index 24010f9..5006800 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -25,7 +25,7 @@
<a href="[% mkurl(ctx.opac_root _ '/home', {$loc_name => loc_value}, 1) %]">[% l('Another Search') %]</a>
</div>
<div class="results_header_btns">
- <a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[% l('Advanced Search') %]</a>
+ <a href="[% mkurl(ctx.opac_root _ '/advanced',{}, general_search_parms.merge(expert_search_parms)) %]">[% l('Advanced Search') %]</a>
</div>
<div id="refine_hits" class="results_header_btns result_block_visible"><a onclick="getFacety();">[% l('Refine these results') %]</a></div>
<div id="return_to_hits" class="results_header_btns"><a onclick="getResulty();">[% l('Back to results') %]</a></div>
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/parts/header.tt2 | 4 ++++
.../src/templates/opac/parts/record/authors.tt2 | 2 +-
.../src/templates/opac/parts/record/series.tt2 | 2 +-
.../src/templates/opac/parts/record/subjects.tt2 | 2 +-
Open-ILS/src/templates/opac/parts/result/table.tt2 | 4 ++--
Open-ILS/src/templates/opac/parts/searchbar.tt2 | 2 +-
Open-ILS/src/templates/opac/results.tt2 | 2 +-
7 files changed, 11 insertions(+), 7 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list