[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 53c0ef3fdb76f95395e829de2cef2c0c6f63d401

[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_2 has been updated
       via  53c0ef3fdb76f95395e829de2cef2c0c6f63d401 (commit)
       via  fc00263d5b96c04af4b9e5bc5e167019427854b5 (commit)
      from  9326986172d4db62c9c2423e6feae532c9c41cec (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 53c0ef3fdb76f95395e829de2cef2c0c6f63d401
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: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/src/templates/opac/parts/misc_util.tt2 b/Open-ILS/src/templates/opac/parts/misc_util.tt2
index 2150d5b..d0ec476 100644
--- a/Open-ILS/src/templates/opac/parts/misc_util.tt2
+++ b/Open-ILS/src/templates/opac/parts/misc_util.tt2
@@ -270,17 +270,11 @@
 
     # 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;
 
 %]

commit fc00263d5b96c04af4b9e5bc5e167019427854b5
Author: Bill Erickson <berick at esilibrary.com>
Date:   Mon Sep 17 09:55:07 2012 -0400

    back-port tpac get_library macro
    
    Code which uses this macro was back-ported without defining the macro.
    Back-ported here for great justice.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/src/templates/opac/parts/misc_util.tt2 b/Open-ILS/src/templates/opac/parts/misc_util.tt2
index d7e93d0..2150d5b 100644
--- a/Open-ILS/src/templates/opac/parts/misc_util.tt2
+++ b/Open-ILS/src/templates/opac/parts/misc_util.tt2
@@ -267,4 +267,20 @@
         END;
 
     END;
+
+    # Get the library or location group
+    # get_library()
+    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;
+    END;
+
 %]

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

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


hooks/post-receive
-- 
Evergreen ILS