From: Dan Scott <dscott@laurentian.ca>
Date: Fri, 31 Aug 2012 21:31:17 +0000 (-0400)
Subject: TPAC: Fall back on physical_loc, if set, for org selector
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=97d305433d1adaa5eca3882f82e516857ecf8b8a;p=working%2FEvergreen.git

TPAC: Fall back on physical_loc, if set, for org selector

If "SetEnv physical_loc 123" is set for a given VirtualHost in the
Apache configuration, that's a useful fallback for cases where a
good default is not otherwise available to us.

Signed-off-by: Dan Scott <dscott@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 1a393c7b05..f699f87c9b 100644
--- a/Open-ILS/src/templates/opac/parts/misc_util.tt2
+++ b/Open-ILS/src/templates/opac/parts/misc_util.tt2
@@ -278,9 +278,9 @@
             IF show_loc_groups; loc_name = 'locg'; END;
         END;
         IF !loc_value;
-            loc_value = CGI.param('loc') || ctx.search_ou;
+            loc_value = CGI.param('loc') || ctx.search_ou || env.physical_loc;
             IF show_loc_groups; 
-                loc_value = CGI.param('locg') || ctx.search_ou;
+                loc_value = CGI.param('locg') || ctx.search_ou || env.physical_loc;
             END;
         END;
     END;