[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. b5eb8762b6ac7bd14f6866051659d0a17c214c68
Evergreen Git
git at git.evergreen-ils.org
Fri May 25 13:32:26 EDT 2018
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_0 has been updated
via b5eb8762b6ac7bd14f6866051659d0a17c214c68 (commit)
from 1061e8db2e52be57e27dd30c1e3a2f07722775d2 (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 b5eb8762b6ac7bd14f6866051659d0a17c214c68
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Mon Feb 5 17:45:22 2018 -0500
LP#1746815: Fix sticky hold url param
Renamed the hold_id url param from "id" to "hid" and prevent it from
sticking in url's where it not needed.
To test
-------
[1] Log in to the public catalog as a patron that has at least
two hold requests.
[2] Go to the My Account holds tab and edit one of the holds.
[3] Rather than submit a change, click on the holds tab again.
[4] Note that /only/ the hold you were edit displays, and that the
'id' URL parameter persists as you navigate through the public
catalog.
[5] Apply the patch and repeat steps 1-3. This time, you should
see all of the holds.
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Michele Morgan <mmorgan at noblenet.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
index 8295e12..fa9ed15 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -950,7 +950,7 @@ sub load_myopac_holds {
my $limit = $self->cgi->param('limit') || 15;
my $offset = $self->cgi->param('offset') || 0;
my $action = $self->cgi->param('action') || '';
- my $hold_id = $self->cgi->param('id');
+ my $hold_id = $self->cgi->param('hid');
my $available = int($self->cgi->param('available') || 0);
my $hold_handle_result;
diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2
index 5a0c3c4..d881d9f 100644
--- a/Open-ILS/src/templates/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds.tt2
@@ -252,7 +252,7 @@
[%- END; END; %]
</td>
<td class="opac-auto-161">
- <a href="[% mkurl(ctx.opac_root _ '/myopac/holds/edit', {id => ahr.id}) %]"
+ <a href="[% mkurl(ctx.opac_root _ '/myopac/holds/edit', {hid => ahr.id}) %]"
[% html_text_attr('title', l('Edit hold for item [_1]', attrs.title)) %]>
[% l('Edit') %]
</a>
diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
index 94259db..15cf56e 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
@@ -37,7 +37,7 @@
ELSE;
cls_which = "acct-tab-off";
END -%]
- <a href="[% mkurl(ctx.opac_root _ '/myopac/' _ page.url, {}, ['bbid', 'offset', 'limit','sort','sort_type']) %]"
+ <a href="[% mkurl(ctx.opac_root _ '/myopac/' _ page.url, {}, ['bbid', 'offset', 'limit','sort','sort_type', 'hid']) %]"
class="[% cls_which %]">[% page.name; %]</a>
[% END %]
</div>
@@ -52,7 +52,7 @@
<option value="" selected="selected">[% l('Go to...') %]</option>
[% FOREACH page IN myopac_pages;
IF page.url != myopac_page; %]
- <option value="[% mkurl(ctx.opac_root _ '/myopac/' _ page.url, {}, ['bbid', 'offset', 'limit']) %]">[% page.name; %]</option>
+ <option value="[% mkurl(ctx.opac_root _ '/myopac/' _ page.url, {}, ['bbid', 'offset', 'limit', 'hid']) %]">[% page.name; %]</option>
[% ELSE; %]
<option value="" disabled>[% page.name; %]</option>
[% END;
diff --git a/Open-ILS/src/templates/opac/parts/topnav.tt2 b/Open-ILS/src/templates/opac/parts/topnav.tt2
index e84fbca..68fd3bb 100644
--- a/Open-ILS/src/templates/opac/parts/topnav.tt2
+++ b/Open-ILS/src/templates/opac/parts/topnav.tt2
@@ -24,7 +24,7 @@
<span class="dash_divider">|</span>
<span class="dash_account_buttons">
<div id="dash_user_message_button_container">
- <a href="[% mkurl(ctx.opac_root _ '/myopac/messages', {}, ['single', 'message_id']) %]" class="opac-button">
+ <a href="[% mkurl(ctx.opac_root _ '/myopac/messages', {}, ['single', 'message_id', 'hid']) %]" class="opac-button">
[% l('Messages') %]
</a>
[% IF ctx.user_stats.messages.unread %]
@@ -34,9 +34,9 @@
</div>
[% END %]
</div>
- <a href="[% mkurl(ctx.opac_root _ '/myopac/main', {}, ['single', 'message_id', 'sort','sort_type']) %]"
+ <a href="[% mkurl(ctx.opac_root _ '/myopac/main', {}, ['single', 'message_id', 'sort','sort_type', 'hid']) %]"
class="opac-button">[% l('My Account') %]</a>
- <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {}, ['single', 'message_id']) %]"
+ <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {}, ['single', 'message_id', 'hid']) %]"
class="opac-button">[% l('My Lists') %]</a>
<a href="[% mkurl(ctx.opac_root _ '/logout', {}, 1) %]"
class="opac-button" id="logout_link">[% l('Logout') %]</a>
@@ -45,26 +45,26 @@
<div id="dashboard">
<span class="dash-align">
<a class="dash-link" href="[% mkurl(ctx.opac_root _ '/myopac/circs', {},
- ['limit','offset', 'single', 'message_id', 'sort','sort_type'])
+ ['limit','offset', 'single', 'message_id', 'sort','sort_type', 'hid'])
%]"><span id="dash_checked">[% ctx.user_stats.checkouts.total_out
%]</span> [% l("Checked Out") %]</a>
</span>
<span class="dash_divider">|</span>
<span class="dash-align">
<a class="dash-link" href="[% mkurl(ctx.opac_root _ '/myopac/holds', {},
- ['available', 'single', 'message_id', 'sort','sort_type'])
+ ['available', 'single', 'message_id', 'sort','sort_type', 'hid'])
%]"><span id="dash_holds">[% ctx.user_stats.holds.total
%]</span> [% l("On Hold") %]</a>
</span>
<span class="dash_divider">|</span>
<span class="dash-align">
<a class="dash-link" href="[% mkurl(ctx.opac_root _ '/myopac/holds',
- {available => 1}, ['single', 'message_id', 'sort','sort_type']) %]"><span id="dash_pickup">[%
+ {available => 1}, ['single', 'message_id', 'sort','sort_type', 'hid']) %]"><span id="dash_pickup">[%
ctx.user_stats.holds.ready %]</span> [% l("Ready for Pickup") %]</a>
</span>
<span class="dash_divider">|</span>
<span class="dash-align">
- <a class="dash-link" href="[% mkurl(ctx.opac_root _ '/myopac/main', {}, ['single', 'message_id', 'sort','sort_type'])
+ <a class="dash-link" href="[% mkurl(ctx.opac_root _ '/myopac/main', {}, ['single', 'message_id', 'sort','sort_type', 'hid'])
%]"><span id="dash_fines">[% money(ctx.user_stats.fines.balance_owed)
%]</span> [% l("Charges") %]</a>
</span>
-----------------------------------------------------------------------
Summary of changes:
.../lib/OpenILS/WWW/EGCatLoader/Account.pm | 2 +-
Open-ILS/src/templates/opac/myopac/holds.tt2 | 2 +-
Open-ILS/src/templates/opac/parts/myopac/base.tt2 | 4 ++--
Open-ILS/src/templates/opac/parts/topnav.tt2 | 14 +++++++-------
4 files changed, 11 insertions(+), 11 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list