[open-ils-commits] [GIT] Evergreen ILS branch master updated. 509c09ed9e472f15da0753f64e82f920efb0edaa
Evergreen Git
git at git.evergreen-ils.org
Fri Jun 1 15:06:16 EDT 2012
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 509c09ed9e472f15da0753f64e82f920efb0edaa (commit)
from c0c481c333e30d9a100ca15557009cff045af7a8 (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 509c09ed9e472f15da0753f64e82f920efb0edaa
Author: Bill Erickson <berick at esilibrary.com>
Date: Fri May 25 14:41:18 2012 -0400
TPAC bookbag CGI param changed to bbid
To avoid propagating a generic URL parameter like 'id', which can be
picked up by other pages and cause breakage, use 'bbid' instead. Also,
clear the 'bbid' param from the my-account tabs.
While we're in there, silence an uninitialized string warning.
Signed-off-by: Bill Erickson <berick at esilibrary.com>
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 85fee15..7399f34 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -1649,22 +1649,22 @@ sub load_myopac_bookbags {
# If the user wants a specific bookbag's items, load them.
# XXX add bookbag item paging support
- if ($self->cgi->param("id")) {
+ if ($self->cgi->param("bbid")) {
my ($bookbag) =
- grep { $_->id eq $self->cgi->param("id") } @{$ctx->{bookbags}};
+ grep { $_->id eq $self->cgi->param("bbid") } @{$ctx->{bookbags}};
if (!$bookbag) {
$e->rollback;
return Apache2::Const::HTTP_INTERNAL_SERVER_ERROR;
}
- if ($self->cgi->param("action") eq "editmeta") {
+ if ( ($self->cgi->param("action") || '') eq "editmeta") {
if (!$self->_update_bookbag_metadata($bookbag)) {
$e->rollback;
return Apache2::Const::HTTP_INTERNAL_SERVER_ERROR;
} else {
$e->commit;
- my $url = $self->ctx->{opac_root} . '/myopac/lists?id=' .
+ my $url = $self->ctx->{opac_root} . '/myopac/lists?bbid=' .
$bookbag->id;
foreach my $param (('loc', 'qtype', 'query', 'sort')) {
@@ -1821,7 +1821,7 @@ sub load_myopac_bookbag_update {
}
} elsif ($action eq 'save_notes') {
$success = $self->update_bookbag_item_notes;
- $url .= "&id=" . uri_escape($cgi->param("id")) if $cgi->param("id");
+ $url .= "&bbid=" . uri_escape($cgi->param("bbid")) if $cgi->param("bbid");
}
return $self->generic_redirect($url) if $success;
diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index c9ee720..9bdbc08 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -57,11 +57,11 @@
<div class="bookbag-controls-holder">
<div class="bookbag-controls most">
[% baseurl = ctx.opac_root _ '/myopac/lists';
- IF bbag.id != CGI.param("id");
- url = mkurl(baseurl,{id => bbag.id},['edit_notes','sort']);
+ IF bbag.id != CGI.param("bbid");
+ url = mkurl(baseurl,{bbid => bbag.id},['edit_notes','sort']);
ltitle = l("Show items in list");
ELSE;
- url = mkurl(baseurl, {}, ['id', 'edit_notes', 'sort']);
+ url = mkurl(baseurl, {}, ['bbid', 'edit_notes', 'sort']);
ltitle = l("Hide items in list");
END %]
<h2 class="bookbag-name"><a title="[% ltitle %]" href="[% url %]">[% bbag.name | html %]</a></h2>
@@ -116,7 +116,7 @@
</div>
<div class="clear-both pad-bottom-five"></div>
</div>
- [% IF CGI.param("id") == bbag.id %]
+ [% IF CGI.param("bbid") == bbag.id %]
<div class="bookbag-specific">
<div class="sort">
<form method="GET">
@@ -125,7 +125,7 @@
[% INCLUDE "opac/parts/filtersort.tt2"
value=CGI.param('sort') mode='bookbag' %]
<input type="hidden" name="id"
- value="[% CGI.param('id') | html %]" />
+ value="[% CGI.param('bbid') | html %]" />
<input type="submit" value="[% l('Sort') %]" />
</form>
</div>
@@ -213,12 +213,12 @@
<input type="checkbox" name="selected_item" value="[% item.id %]" bbag='[% bbag.id %]'/>
</td>
<td class="list_entry">
- <a href="[% mkurl(ctx.opac_root _ '/record/' _ rec_id, {}, ['edit_notes', 'id']) %]">[% attrs.title | html %]</a>
+ <a href="[% mkurl(ctx.opac_root _ '/record/' _ rec_id, {}, ['edit_notes', 'bbid']) %]">[% attrs.title | html %]</a>
</td>
<td class="list_entry">
<a href="[%-
authorquery = attrs.author | replace('[,\.:;]', '');
- mkurl(ctx.opac_root _ '/results', {qtype => 'author', query => authorquery}, ['page', 'id', 'edit_notes'])
+ mkurl(ctx.opac_root _ '/results', {qtype => 'author', query => authorquery}, ['page', 'bbid', 'edit_notes'])
-%]">[% attrs.author | html %]</a>
[% IF CGI.param("edit_notes") == bbag.id %]
<td class="list_entry">
@@ -241,7 +241,7 @@
<td colspan="3"><!-- All space left of notes column --></td>
<td class="save-notes">
[%- INCLUDE "opac/parts/preserve_params.tt2"; %]
- <input type="hidden" name="id" value="[% CGI.param('id') | html %]" />
+ <input type="hidden" name="id" value="[% CGI.param('bbid') | html %]" />
<input type="submit" name="save_notes" value="[% l('Save Notes') %]" />
</td>
</tr>
diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
index 9c11f13..763e65b 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
@@ -23,7 +23,7 @@
ELSE;
cls_which = "acct-tab-off";
END -%]
- <a href="[% mkurl(ctx.opac_root _ '/myopac/' _ page.url) %]"
+ <a href="[% mkurl(ctx.opac_root _ '/myopac/' _ page.url, {}, ['bbid']) %]"
class="[% cls_which %]">[% page.name; %]</a>
[% END %]
</div>
-----------------------------------------------------------------------
Summary of changes:
.../lib/OpenILS/WWW/EGCatLoader/Account.pm | 10 +++++-----
Open-ILS/src/templates/opac/myopac/lists.tt2 | 16 ++++++++--------
Open-ILS/src/templates/opac/parts/myopac/base.tt2 | 2 +-
3 files changed, 14 insertions(+), 14 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list