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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-07-29 10:20:03 +0200 (Wed, 29 Jul 2009)
New Revision: 562

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/model/case.py
Log:
Fixed statement printing


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-07-29 07:56:59 UTC (rev 561)
+++ wasko/trunk/ChangeLog.txt	2009-07-29 08:20:03 UTC (rev 562)
@@ -7,6 +7,11 @@
 	  waskaweb/lib/validators.py,
 	  waskaweb/templates/casemanagement/new.mako:
 
+	Make printing of the statement work on case creation again. 
+
+	* waskaweb/model/case.py: Adopted fieldnames.
+
+
 2009-07-28	Sascha L. Teichmann	<sascha.teichmann at intevation.de>
 
 	* waskaweb/model/case.py: Fixed creation of new cases.

Modified: wasko/trunk/waskaweb/model/case.py
===================================================================
--- wasko/trunk/waskaweb/model/case.py	2009-07-29 07:56:59 UTC (rev 561)
+++ wasko/trunk/waskaweb/model/case.py	2009-07-29 08:20:03 UTC (rev 562)
@@ -889,21 +889,21 @@
         return self.privacy_statement
 
     def setData(self, params):
-        self.last_name  = save_getone(params, "name_1",    "")
-        self.first_name = save_getone(params, "vorname_1", "")
-        self.street     = save_getone(params, "strasse",   "")
-        self.streetnr   = save_getone(params, "strassenr", "")
-        self.plz        = save_getone(params, "plz",       "")
-        self.city       = save_getone(params, "wohnort",   "")
+        self.last_name  = save_getone(params, "name",    "")
+        self.first_name = save_getone(params, "vorname", "")
+        self.street     = save_getone(params, "addresse_strasse",   "")
+        self.streetnr   = save_getone(params, "addresse_strassenr", "")
+        self.plz        = save_getone(params, "addresse_plz",       "")
+        self.city       = save_getone(params, "addresse_ort",   "")
 
     def toFormData(self):
         return {
-            'strasse'  : self.street,
-            'strassenr': self.streetnr,
-            'plz'      : self.plz,
-            'wohnort'  : self.city,
-            'name_1'   : self.last_name,
-            'vorname_1': self.first_name
+            'addresse_strasse'  : self.street,
+            'addresse_strassenr': self.streetnr,
+            'addresse_plz'      : self.plz,
+            'addresse_ort'  : self.city,
+            'name'   : self.last_name,
+            'vorname': self.first_name
         }
 
     def getFirstMeeting(self):