r5718 - trunk/gnue-common/src/datasources/drivers/appserver/appserver

[johannes]

Author: johannes
Date: 2004-04-14 08:04:02 -0500 (Wed, 14 Apr 2004)
New Revision: 5718

Modified:
   trunk/gnue-common/src/datasources/drivers/appserver/appserver/DataObject.py
Log:
Combine existing static conditions.


Modified: 
trunk/gnue-common/src/datasources/drivers/appserver/appserver/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/appserver/appserver/DataObject.py 
2004-04-14 12:17:52 UTC (rev 5717)
+++ trunk/gnue-common/src/datasources/drivers/appserver/appserver/DataObject.py 
2004-04-14 13:04:02 UTC (rev 5718)
@@ -82,8 +82,9 @@
   def _createResultSet (self, conditions = {}, readOnly = 0,
                         masterRecordSet = None, sql = ''):
 
-    if conditions:
-      filter = self._buildQuery (conditions)
+    rscond = GConditions.combineConditions (conditions, self._staticCondition)
+    if rscond:
+      filter = self._buildQuery (rscond)
     else:
       filter = []