[Mpuls-commits] r311 - in wasko/trunk: . waskaweb/controllers waskaweb/i18n/de/LC_MESSAGES

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-02-26 15:51:53 +0100 (Thu, 26 Feb 2009)
New Revision: 311

Modified:
   wasko/trunk/ChangeLog.txt
   wasko/trunk/waskaweb/controllers/case.py
   wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
Log:
Fixed update of infofield


Modified: wasko/trunk/ChangeLog.txt
===================================================================
--- wasko/trunk/ChangeLog.txt	2009-02-26 14:03:57 UTC (rev 310)
+++ wasko/trunk/ChangeLog.txt	2009-02-26 14:51:53 UTC (rev 311)
@@ -13,6 +13,10 @@
 	  waskaweb/templates/casemanagement/digest_body.mako: Fixed broken
 	  rendering of formular pages in IE7.
 
+	* waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+	  waskaweb/controllers/case.py: Fixed Update of infofield. Renamed
+	  label in infofield
+
 2009-02-25	Sascha L. Teichmann <teichmann at intevation.de>
 
 	* waskaweb/model/phases_factory.py: Fixed problem with access to var cache.

Modified: wasko/trunk/waskaweb/controllers/case.py
===================================================================
--- wasko/trunk/waskaweb/controllers/case.py	2009-02-26 14:03:57 UTC (rev 310)
+++ wasko/trunk/waskaweb/controllers/case.py	2009-02-26 14:51:53 UTC (rev 311)
@@ -396,10 +396,12 @@
 
         # If we edit page_1 we better update the infofield because the names
         # may have been edited 
-        if ti.name == "page-1":
+        if ti.name == "page-0":
             try:
-                case_session.last_name = request.params.getone("name_1")
-                case_session.first_name = request.params.getone("vorname_1")
+                case_session.last_name     = request.params.get("name")
+                case_session.first_name    = request.params.get("vorname")
+                case_session.first_meeting = request.params.get("erstgespraech")
+                case_session.knr           = request.params.get("fn")
                 session.save()
             except KeyError:
                 print >> sys.stderr, "Error! Could not update Infofield"
@@ -418,14 +420,6 @@
         else:
             c.status_msg = h.status_message(u'Daten erfolgreich gespeichert. Bitte beachten Sie die <a href="/case/showhelp/datenschutz_veraenderte_daten" target="_blank">Hinweise zur Datenschutz.</a>')
 
-        if ti.name == "page-0":
-            try:
-                case_session.first_meeting = page.getData("erstgespraech")
-                case_session.knr           = page.getData("kundennummer")
-            except:
-                traceback.print_exc(file=sys.stderr)
-            session.save()
-
         case_session.setFormErrors(new_errors)
         session.save()
 

Modified: wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-02-26 14:03:57 UTC (rev 310)
+++ wasko/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-02-26 14:51:53 UTC (rev 311)
@@ -1832,7 +1832,7 @@
 
 #: waskaweb/templates/casemanagement/main.mako:25
 msgid "cm_info_nr"
-msgstr "Kundennr."
+msgstr "Fallnr."
 
 #: waskaweb/templates/casemanagement/main.mako:31
 msgid "cm_main_header_data_protection"