[Mpuls-commits] r3990 - base/trunk

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-10-20 11:50:02 +0200 (Wed, 20 Oct 2010)
New Revision: 3990

Modified:
   base/trunk/ChangeLog
Log:
Updated ChangeLog


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-10-20 09:49:46 UTC (rev 3989)
+++ base/trunk/ChangeLog	2010-10-20 09:50:02 UTC (rev 3990)
@@ -3,6 +3,12 @@
 	* mpulsweb/templates/phase/phase.mako: Issue939: Get url of images
 	with "url_for". Loading images with "/images/..." fails because of
 	special url routing in JMD. 
+	* mpulsweb/controllers/formularpage.py
+	(FormularpageController._handle_automatic_phase_change): Issue1253: Do
+	not escape phase descriptions.
+	* mpulsweb/model/phase.py (PhasePart.getDescription): Do not return
+	"Running" or "Finnished" appended to the phase description if phase is
+	unknown.
 
 2010-10-18  Torsten Irlaender <torsten at intevation.de>