[Mpuls-commits] r2329 - wasko/branches/2.0

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-04-14 09:10:21 +0200 (Wed, 14 Apr 2010)
New Revision: 2329

Modified:
   wasko/branches/2.0/ChangeLog
Log:



Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-04-14 07:10:07 UTC (rev 2328)
+++ wasko/branches/2.0/ChangeLog	2010-04-14 07:10:21 UTC (rev 2329)
@@ -1,3 +1,31 @@
+2010-04-14  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	* mpulsweb/model/phase.py: Fixed checking neighborship of to
+	phaseparts, which is needed to determine if a phase can be started.  
+	* mpulsweb/templates/phase/phase.mako: Display state of a phase
+	correctly.
+
+2010-04-13  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	* jmd.json: Adapted required fields definition to the current
+	foredtree.
+	* mpulsweb/model/phase.py (walk_it): Helper function to get all items
+	ins instance tree.
+	* mpulsweb/model/phase.py (get_flags): Helper for formular items.
+	Parses flags attribute and returns a dictionary with phase ids for
+	required fields and time fields.
+	* mpulsweb/model/phase.py (PhasePart.__init__): Do not load
+	information about required fields and time fields for json config but
+	from formedtree.
+	* mpulsweb/model/phase.py (Field.__init__): Initialise fields with
+	Rule-Nodes fro formed.
+	* mpulsweb/model/phase.py (Condition.evaluate): Evaluate rules
+	depending on context (conditionals etc.) 
+	* jmd.json: Removed definition of required fields and datefield for
+	phases.
+	* mpulsweb/lib/config.py: Removed definition of required fields and
+	datefield for phases.
+
 2010-04-12  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* contrib/apache/mpuls.wsgi,
@@ -14,6 +42,8 @@
 	icons for required-fields and evaluation relevant fields based on the
 	info in the formedtree rather then looking for an available entry in
 	the annotationsfile.
+	* mpulsweb/controllers/annotations.py: Return default string if no
+	helptext can be found.
 
 2010-04-12  Roland Geider <roland.geider at intevation.de>