LP#1340852: Retain search params for copy location groups

The order in which we determined what to 'selected' in the "Library"
dropdown put the resolved locg first (which allows for shortnames, e.g.
BR1).  That only gives us half the location group though, which is why
it was bumping up a level.  Now, if we have a location group selected,
it will use that first (since they don't have shortnames); the remaining
select order will be the same.

Signed-off-by: Jake Litrell <jake@masslnc.org>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Signed-off-by: Ben Shum <bshum@biblio.org>

diff --git a/Open-ILS/src/templates/opac/parts/misc_util.tt2 b/Open-ILS/src/templates/opac/parts/misc_util.tt2
index 6c2cb47..c889c55 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/misc_util.tt2
+++ b/Open-ILS/src/templates/opac/parts/misc_util.tt2
@@ -633,8 +633,12 @@
     # which is a superset of 'loc'.
     BLOCK get_library;
         loc_name = 'locg';
-        loc_value = ctx.copy_location_group_org ||  # resolved locg
-            CGI.param(loc_name) || CGI.param('loc') || ctx.search_ou;
+
+        # Location groups don't have shortnames, so they'll take priority
+        # (_org doesn't contain the group and breaks the selector).
+        loc_value = ctx.copy_location_group ? CGI.param(loc_name)
+                  : ctx.copy_location_group_org # resolved locg
+                    || CGI.param(loc_name) || CGI.param('loc') || ctx.search_ou;
     END;
 
 %]