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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-02-10 15:40:21 +0100 (Wed, 10 Feb 2010)
New Revision: 1464

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/model/case.py
Log:
* waskaweb/model/case.py (Case.get_preset_fields): Use the
formedname in the list of preset fields, not the alias name,
otherwise the presets won't work in
CaseFactory.loadFromQueryResult.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-10 14:40:07 UTC (rev 1463)
+++ wasko/branches/2.0/ChangeLog	2010-02-10 14:40:21 UTC (rev 1464)
@@ -1,3 +1,10 @@
+2010-02-10  Bernhard Herzog  <bh at intevation.de>
+
+	* waskaweb/model/case.py (Case.get_preset_fields): Use the
+	formedname in the list of preset fields, not the alias name,
+	otherwise the presets won't work in
+	CaseFactory.loadFromQueryResult.
+
 2010-02-10  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* mpulsweb/controllers/administration.py

Modified: wasko/branches/2.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/model/case.py	2010-02-10 14:40:07 UTC (rev 1463)
+++ wasko/branches/2.0/waskaweb/model/case.py	2010-02-10 14:40:21 UTC (rev 1464)
@@ -693,7 +693,7 @@
         The list is intended to be used when populating the preset
         mapping passed to the constructor.
         """
-        return [item.name for item in cls.aliases]
+        return [alias.formedname for alias in cls.aliases]
 
     @classmethod
     def get_session_fields(cls):