From 8ab1bd5f05da9dd91a94ad3c1b7f1acf9303496e Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Sun, 12 Aug 2012 03:25:49 -0400 Subject: [PATCH] TPAC - add library scoping to shelf browser The shelf browser currently uses the 'loc' variable to define scoping and limit browsing to specific org units. However, since much of the scoping actually uses 'locg', the scoping was broken for the shelf browser. Additionally, under Advanced Search's Numeric Search, the option for 'Call Number (Shelf Browse)' only applies the 'cn' variable to searches and never adds the search scope, despite the search library now being an available filter choice. Based on suggestion by Dan Scott in IRC, this patch uses the function for _get_search_lib() to retrieve the search library and add it to both parts of the shelf browser. Signed-off-by: Ben Shum Signed-off-by: Dan Scott --- Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm | 2 +- Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm index af1c3fc3d4..cdf7e1508f 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Record.pm @@ -332,7 +332,7 @@ sub prepare_browse_call_numbers { my $cn = ($self->cgi->param("cn") || $self->any_call_number_label) or return []; - my $org_unit = $self->ctx->{get_aou}->($self->cgi->param('loc')) || + my $org_unit = $self->ctx->{get_aou}->($self->_get_search_lib()) || $self->ctx->{aou_tree}->(); my $supercat = create OpenSRF::AppSession("open-ils.supercat"); diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm index 1bf8b61c63..8ed18125c3 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Search.pm @@ -662,6 +662,7 @@ sub call_number_browse_standalone { $self->ctx->{opac_root}, $cnfrag # XXX some kind of escaping needed here? ); + $url .= '&locg=' . $self->_get_search_lib() if ($self->_get_search_lib()); return $self->generic_redirect($url); } else { return $self->generic_redirect; # return to search page -- 2.11.0