From 65d23b647978ddd2cd701b3cfbcbbc6552583fe0 Mon Sep 17 00:00:00 2001
From: Thomas Berezansky <tsbere@mvlc.org>
Date: Wed, 14 Mar 2012 14:04:30 -0400
Subject: [PATCH] Fix issues with org selectors leaking variables

Use of PROCESS leaks variables, switch them to INCLUDE instead.

Signed-off-by: Thomas Berezansky <tsbere@mvlc.org>
Signed-off-by: Dan Scott <dan@coffeecode.net>
---
 Open-ILS/src/templates/opac/myopac/holds/edit.tt2     | 2 +-
 Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 | 2 +-
 Open-ILS/src/templates/opac/parts/advanced/search.tt2 | 2 +-
 Open-ILS/src/templates/opac/parts/org_selector.tt2    | 5 ++++-
 Open-ILS/src/templates/opac/parts/place_hold.tt2      | 2 +-
 Open-ILS/src/templates/opac/parts/searchbar.tt2       | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/src/templates/opac/myopac/holds/edit.tt2 b/Open-ILS/src/templates/opac/myopac/holds/edit.tt2
index eb2612e689..293199f53a 100644
--- a/Open-ILS/src/templates/opac/myopac/holds/edit.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds/edit.tt2
@@ -47,7 +47,7 @@
                             [% l('Pickup library') %]
                         </th>
                         <td>
-                            [% PROCESS build_org_selector
+                            [% INCLUDE build_org_selector
                                 name='pickup_lib' value=ahr.pickup_lib %]
                         </td>
                     </tr>
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
index 7cb310379e..8e301d581c 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
@@ -45,7 +45,7 @@
                             IF ctx.user_setting_map.$setting;
                                 thang = ctx.user_setting_map.$setting;
                             END;
-                            PROCESS build_org_selector name=setting value=thang;
+                            INCLUDE build_org_selector name=setting value=thang;
                         %]
                     </td>
                 </tr>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index 6b622216ec..697f951762 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -67,7 +67,7 @@
                         <td valign='top'>
                             <strong>[% l("Search Library") %]</strong><br />
                             [% PROCESS "opac/parts/org_selector.tt2";
-                                PROCESS build_org_selector show_loc_groups=1 %]
+                                INCLUDE build_org_selector show_loc_groups=1 %]
                             <div style="position:relative;top:7px;">
                                 <input type='checkbox' name="modifier"
                                     value="available"[% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %]
diff --git a/Open-ILS/src/templates/opac/parts/org_selector.tt2 b/Open-ILS/src/templates/opac/parts/org_selector.tt2
index 02c24489b6..fd9c8c0f9f 100644
--- a/Open-ILS/src/templates/opac/parts/org_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/org_selector.tt2
@@ -1,7 +1,10 @@
 [%
 # Org Unit Selector Widget :
-#   PROCESS build_org_selector id='selector-id' name='selector-name' 
+#   INCLUDE build_org_selector id='selector-id' name='selector-name' 
 #       value=org_id show_loc_groups=1/0 can_have_vols_only=1/0
+#
+# NOTE: DO NOT USE PROCESS
+# Use of PROCESS results in internal variables, such as value or org_unit, to "leak" out
 
 BLOCK build_org_selector;
     node_stack = [{org => org_unit || ctx.aou_tree}];
diff --git a/Open-ILS/src/templates/opac/parts/place_hold.tt2 b/Open-ILS/src/templates/opac/parts/place_hold.tt2
index 97ffe967e3..f5f224bfe9 100644
--- a/Open-ILS/src/templates/opac/parts/place_hold.tt2
+++ b/Open-ILS/src/templates/opac/parts/place_hold.tt2
@@ -68,7 +68,7 @@
         <p>
             [% l('Pickup location:') %]
             [% PROCESS "opac/parts/org_selector.tt2";
-                PROCESS build_org_selector name='pickup_lib' value=ctx.default_pickup_lib id='pickup_lib' can_have_vols_only=1 %]
+                INCLUDE build_org_selector name='pickup_lib' value=ctx.default_pickup_lib id='pickup_lib' can_have_vols_only=1 %]
         </p>
         <p>
             [% l('Notify when hold is ready for pickup?') %]
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index d0fa8ea390..fccac1132c 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -28,7 +28,7 @@
                 [%- END # autosuggest enabled %] />
         </span>
         [%- INCLUDE "opac/parts/qtype_selector.tt2" id="qtype";
-            l(' in '); PROCESS build_org_selector show_loc_groups=1
+            l(' in '); INCLUDE build_org_selector show_loc_groups=1
     %]
     <span>
         <input id='search-submit-go' type="submit" value="[% l('Search') %]" alt="[% l('Search') %]" class="opac-button"
-- 
2.11.0