[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. 8292cb5d1e71715187e1adc6cee602bf65b45877

[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, rel_2_3 has been updated
       via  8292cb5d1e71715187e1adc6cee602bf65b45877 (commit)
      from  4dbef40874c931368c52af413860b47e89565d6b (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 8292cb5d1e71715187e1adc6cee602bf65b45877
Author: Bill Erickson <berick at esilibrary.com>
Date:   Fri Sep 21 17:10:58 2012 -0400

    Copy location group searching repairs
    
    In the get_library BLOCK, upgrade any use of 'loc' to 'locg' instead of
    trying to determine which to use in which situation.  Before this change,
    'loc' was being used as the loc_name for the main org unit selector,
    which should always use 'locg'.  For any other cases (related to search
    params), it's always safe to use 'locg' over 'loc'.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/templates/opac/parts/misc_util.tt2 b/Open-ILS/src/templates/opac/parts/misc_util.tt2
index 67805ac..45d3f54 100644
--- a/Open-ILS/src/templates/opac/parts/misc_util.tt2
+++ b/Open-ILS/src/templates/opac/parts/misc_util.tt2
@@ -281,16 +281,10 @@
 
     # Get the library or location group
     # get_library()
+    # magically upgrades any use of 'loc' to 'locg', 
+    # which is a superset of 'loc'.
     BLOCK get_library;
-        IF !loc_name; 
-            loc_name = 'loc';
-            IF show_loc_groups; loc_name = 'locg'; END;
-        END;
-        IF !loc_value;
-            loc_value = CGI.param('loc') || ctx.search_ou;
-            IF show_loc_groups; 
-                loc_value = CGI.param('locg') || ctx.search_ou;
-            END;
-        END;
+        loc_name = 'locg';
+        loc_value = CGI.param(loc_name) || CGI.param('loc') || ctx.search_ou;
     END;
 %]

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

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


hooks/post-receive
-- 
Evergreen ILS