[Mpuls-commits] r397 - in wasko/trunk: . waskaweb/controllers waskaweb/model

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2009-03-18 12:57:31 +0100 (Wed, 18 Mar 2009)
New Revision: 397

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/controllers/CaseBase.py
   wasko/trunk/waskaweb/model/data.py
Log:
Fixed minor issues with conditionals.


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-03-18 11:38:20 UTC (rev 396)
+++ wasko/trunk/ChangeLog.txt	2009-03-18 11:57:31 UTC (rev 397)
@@ -1,3 +1,10 @@
+2009-03-18	Sascha L. Teichmann <teichmann at intevation.de>
+
+	* waskaweb/model/data.py: forgot isInvisible/setInvisible methods.
+
+	* waskaweb/controllers/CaseBase.py: construct FormDataImpl with
+	  reference to formed tree. needed for evaluation of conditionals.
+
 2009-03-18	Torsten Irlaender  <torsten.irlaender at intevation.de> 
 
 	Encoding fixes 

Modified: wasko/trunk/waskaweb/controllers/CaseBase.py
===================================================================
--- wasko/trunk/waskaweb/controllers/CaseBase.py	2009-03-18 11:38:20 UTC (rev 396)
+++ wasko/trunk/waskaweb/controllers/CaseBase.py	2009-03-18 11:57:31 UTC (rev 397)
@@ -101,11 +101,12 @@
         form_errors = case.getFormErrors()
         formdata = FormDataImpl(
             FileCache(),
-            help=help, 
-            page=pagestore, 
-            errors=form_errors,
-            warnings=warnings,
-            nc=[page])
+            help     = help, 
+            page     = pagestore, 
+            errors   = form_errors,
+            warnings = warnings,
+            nc       = [page],
+            formed   = g.formedTree)
         return (formdata, warnings)
 
     def _setState(self, id, state):

Modified: wasko/trunk/waskaweb/model/data.py
===================================================================
--- wasko/trunk/waskaweb/model/data.py	2009-03-18 11:38:20 UTC (rev 396)
+++ wasko/trunk/waskaweb/model/data.py	2009-03-18 11:57:31 UTC (rev 397)
@@ -140,7 +140,13 @@
     def getExpr(self):
         return self.expr
 
+    def isInvisible(self):
+        return self.getAttribute("invisible") and True or False
 
+    def setInvisible(self):
+        invisible = invisible and "true" or ""
+        self.setAttribute("invisible", invisible)
+
 class MatrixNode(GroupNode):
     def __init__(self):
         GroupNode.__init__(self)