[Mpuls-commits] r3988 - base/trunk/mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-10-20 11:26:08 +0200 (Wed, 20 Oct 2010)
New Revision: 3988

Modified:
   base/trunk/mpulsweb/controllers/formularpage.py
Log:
* mpulsweb/controllers/formularpage.py
(FormularpageController._handle_automatic_phase_change): Issue1253: Do
not escape phase descriptions.



Modified: base/trunk/mpulsweb/controllers/formularpage.py
===================================================================
--- base/trunk/mpulsweb/controllers/formularpage.py	2010-10-20 09:09:47 UTC (rev 3987)
+++ base/trunk/mpulsweb/controllers/formularpage.py	2010-10-20 09:26:08 UTC (rev 3988)
@@ -7,8 +7,7 @@
 
 import formencode
 
-from pylons import request, c
-from pylons import g
+from pylons import request, c, g, h
 from pylons.controllers.util import abort, redirect_to
 
 from formed.instance.backends.postgres import DBFactory as InstanceFactory, \
@@ -258,8 +257,8 @@
                     case.getState().setPhase(reachable_phase)
                     # build dialog
                     c.dialog_title = DIALOG_FULLAUTOMATIC_CHANGE_TITLE
-                    c.dialog_text = (DIALOG_FULLAUTOMATIC_CHANGE_TEXT
-                                     % (cpd, rpd))
+                    c.dialog_text = h.literal((DIALOG_FULLAUTOMATIC_CHANGE_TEXT
+                                     % (cpd, rpd)))
                     c.url_ok = url_for(controller="formularpage",
                                        action="select", id=page_id)
                     return render('/phase/dialogs/success_fullautomatic_set_phase.mako')
@@ -267,8 +266,8 @@
                     log.debug("halfautomatic phase change!")
                     # build dialog
                     c.dialog_title = DIALOG_HALFAUTOMATIC_CHANGE_TITLE
-                    c.dialog_text = (DIALOG_HALFAUTOMATIC_CHANGE_TEXT
-                                     % (cpd, rpd))
+                    c.dialog_text = h.literal((DIALOG_HALFAUTOMATIC_CHANGE_TEXT
+                                     % (cpd, rpd)))
                     c.url_ok = url_for(controller="phase", action="setPhase",
                                        id=session['case'].id,
                                        value=reachable_phase)