[gnue] r10114 - in trunk/gnue-forms/src: . GFObjects

[reinhard]

Author: reinhard
Date: 2009-12-09 16:39:57 -0600 (Wed, 09 Dec 2009)
New Revision: 10114

Modified:
   trunk/gnue-forms/src/GFForm.py
   trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Unbound blocks are never queryable.


Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py      2009-12-09 22:22:15 UTC (rev 10113)
+++ trunk/gnue-forms/src/GFForm.py      2009-12-09 22:39:57 UTC (rev 10114)
@@ -1390,7 +1390,10 @@
                     button.update_status()
 
                 for block in self._logic._blockList:
-                    block.apply_filter()
+                    if block.queryable:
+                        block.apply_filter()
+                    else:
+                        block.discard_filter()
 
                 for block in self._logic._blockList:
                     block.processTrigger('POST-QUERY')

Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2009-12-09 22:22:15 UTC (rev 
10113)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2009-12-09 22:39:57 UTC (rev 
10114)
@@ -274,6 +274,8 @@
             self._form._datasourceDictionary[datasource.name] = datasource
             datasource._buildObject()
             datasource.phaseInit()
+            # Unbound blocks are not queryable.
+            self.queryable = False
 
         dsDict = self._form._datasourceDictionary
         self._dataSourceLink = dsDict.get(self.datasource)
@@ -1084,7 +1086,7 @@
         """
 
         if offset == 0:
-            if self.mode == 'query':
+            if self.mode == 'query' and self.queryable:
                 value = self.__query_values.get(field)
 
             elif self.mode == 'init':