[open-ils-commits] [GIT] Evergreen ILS branch master updated. 1a5a1373842b5972c7f7c8e40d3174a077a97cb2

[Evergreen Git]

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  1a5a1373842b5972c7f7c8e40d3174a077a97cb2 (commit)
      from  e42fd2edb6f8de0ac57ec997577498732a9a1eb5 (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 1a5a1373842b5972c7f7c8e40d3174a077a97cb2
Author: Jake Litrell <jake at masslnc.org>
Date:   Mon Sep 14 17:49:29 2015 -0400

    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 at masslnc.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Ben Shum <bshum at 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
--- 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;
 
 %]

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/opac/parts/misc_util.tt2 |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS