[Mpuls-commits] r5051 - in base/trunk: . mpulsweb/controllers mpulsweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-06-01 11:04:18 +0200 (Wed, 01 Jun 2011)
New Revision: 5051

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/controllers/evaluate.py
   base/trunk/mpulsweb/templates/casemanagement/upload.mako
Log:
don't escape the text

Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2011-06-01 08:55:24 UTC (rev 5050)
+++ base/trunk/ChangeLog	2011-06-01 09:04:18 UTC (rev 5051)
@@ -1,3 +1,7 @@
+2011-06-01  Roland Geider <roland.geider at intevation.de>
+
+	* mpulsweb/templates/casemanagement/upload.mako: don't escape the text
+
 2011-05-31  Ludwig Reiter <ludwig.reiter at intevation.de>
 
 	* mpulsweb/model/appointment.py:

Modified: base/trunk/mpulsweb/controllers/evaluate.py
===================================================================
--- base/trunk/mpulsweb/controllers/evaluate.py	2011-06-01 08:55:24 UTC (rev 5050)
+++ base/trunk/mpulsweb/controllers/evaluate.py	2011-06-01 09:04:18 UTC (rev 5051)
@@ -273,6 +273,7 @@
                                               None, None, None,
                                               eval_params['sql'],
                                               eval_params['typelist'])
+                # Set second parameter to True to enable debugging
                 evalset = EvaluationSet(evalconfig)
                 evalset.evaluate()
             except:

Modified: base/trunk/mpulsweb/templates/casemanagement/upload.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/upload.mako	2011-06-01 08:55:24 UTC (rev 5050)
+++ base/trunk/mpulsweb/templates/casemanagement/upload.mako	2011-06-01 09:04:18 UTC (rev 5051)
@@ -7,7 +7,7 @@
 </%def>
 <h1>${_('XML Import')}</h1>
 <p>
-  ${_('You can add XML files. The size of a file must not exceed 10 MB.')}
+  ${h.literal(_('You can add XML files. The size of a file must not exceed 10 MB.'))}
 </p>
 <br>
 ${h.form(h.url(controller='/case', action='importXMLAction'), multipart=True)}