[Mpuls-commits] r3231 - in base/trunk: . mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-07-23 11:36:08 +0200 (Fri, 23 Jul 2010)
New Revision: 3231

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/renderer.py
Log:
* mpulsweb/lib/renderer.py (ViewRenderer._renderRadio)
(ViewRenderer._renderChoice, ViewRenderer._renderMatrix): Adapt to
BoolLeaf changes in libformed.  The getValue now returns int or None.
Requires libformed revision 185:0db601d9f4bd


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-07-23 07:48:02 UTC (rev 3230)
+++ base/trunk/ChangeLog	2010-07-23 09:36:08 UTC (rev 3231)
@@ -1,3 +1,10 @@
+2010-07-23  Bernhard Herzog  <bh at intevation.de>
+
+	* mpulsweb/lib/renderer.py (ViewRenderer._renderRadio)
+	(ViewRenderer._renderChoice, ViewRenderer._renderMatrix): Adapt to
+	BoolLeaf changes in libformed.  The getValue now returns int or None.
+	Requires libformed revision 185:0db601d9f4bd
+
 2010-07-23  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* mpulsweb/templates/info/info.mako: Added information on

Modified: base/trunk/mpulsweb/lib/renderer.py
===================================================================
--- base/trunk/mpulsweb/lib/renderer.py	2010-07-23 07:48:02 UTC (rev 3230)
+++ base/trunk/mpulsweb/lib/renderer.py	2010-07-23 09:36:08 UTC (rev 3231)
@@ -607,7 +607,7 @@
     def _renderRadio(self, node):
         meta = self._getMeta(node)
         id = node.getIdentifier()
-        current_value = str(node.getValue())
+        current_value = node.getValue()
         out = []
         out.append(self._renderLabel(node))
         out.append(self._renderAttributes(node))
@@ -661,7 +661,7 @@
         out.append(tag("select", id=id, name=id, size=meta.getSize() or "1",
                        multiple=bool(meta.getMultiple()), disabled=self.ro_mode,
                        **SET_MODIFICATION_ATTRS))
-        self.stateStack.append(str(node.getValue()))
+        self.stateStack.append(node.getValue())
         out.append(self._renderRecursive(meta, False, ChoiceContainer))
         self.stateStack.pop()
         out.append('</select>')
@@ -734,7 +734,7 @@
             out.append(self._renderLabel(row, False))
             out.extend(self._renderAttributes(row))
             out.append('</td>')
-            self.stateStack.append(str(row.getValue()))
+            self.stateStack.append(row.getValue())
             for col in self._getMeta(row).children:
                 value = col.getValue()
                 out.append(tag("td", class_=(num%2 and "hl" or "")))