[Mpuls-commits] r1676 - in wasko/branches/2.0: . waskaweb/model

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-22 16:57:09 +0100 (Mon, 22 Feb 2010)
New Revision: 1676

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/model/case.py
Log:
* waskaweb/model/case.py (SessionCase.setData)
(SessionCase.toFormData): The conversion from AliasDescription to
Field was incomplete. Fix it.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-22 12:17:36 UTC (rev 1675)
+++ wasko/branches/2.0/ChangeLog	2010-02-22 15:57:09 UTC (rev 1676)
@@ -1,5 +1,11 @@
 2010-02-22  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/model/case.py (SessionCase.setData)
+	(SessionCase.toFormData): The conversion from AliasDescription to
+	Field was incomplete. Fix it.
+
+2010-02-22  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/model/case.py (Case.init_state): New method to
 	instantiate the State object.
 	(Case.__init__): Add parameters: state_id=None, state_status,

Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py	2010-02-22 12:17:36 UTC (rev 1675)
+++ wasko/branches/2.0/waskaweb/model/case.py	2010-02-22 15:57:09 UTC (rev 1676)
@@ -550,14 +550,14 @@
 
     def setData(self, params):
         for field in self._session_fields():
-            setattr(self, field.alias, desc.convert(save_getone(params,
-                                                                field.name,
-                                                                field.default)))
+            setattr(self, field.alias,
+                    field.convert(save_getone(params, field.name,
+                                              field.default)))
 
     def toFormData(self):
         data = {}
-        for desc in self._session_fields():
-            data[desc.formedname] = getattr(self, desc.name)
+        for field in self._session_fields():
+            data[field.name] = getattr(self, field.alias)
         return data
 
     def isYoungerThan(self, mydate):