[Mpuls-commits] r3040 - in base/trunk: . mpulsweb/templates/logbook

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-06-18 18:47:41 +0200 (Fri, 18 Jun 2010)
New Revision: 3040

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/logbook/overview_print.mako
Log:
* mpulsweb/templates/logbook/overview_print.mako: Use nl_to_br to
convert newlines for HTML instead of having the code inline.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-06-18 16:29:31 UTC (rev 3039)
+++ base/trunk/ChangeLog	2010-06-18 16:47:41 UTC (rev 3040)
@@ -1,5 +1,10 @@
 2010-06-18  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/logbook/overview_print.mako: Use nl_to_br to
+	convert newlines for HTML instead of having the code inline.
+
+2010-06-18  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/lib/renderer.py (ViewRenderer._renderTextArea): Use
 	nl_to_br to convert newlines for HTML instead of having the code
 	inline.

Modified: base/trunk/mpulsweb/templates/logbook/overview_print.mako
===================================================================
--- base/trunk/mpulsweb/templates/logbook/overview_print.mako	2010-06-18 16:29:31 UTC (rev 3039)
+++ base/trunk/mpulsweb/templates/logbook/overview_print.mako	2010-06-18 16:47:41 UTC (rev 3040)
@@ -42,8 +42,8 @@
           </tr>
           <tr>
               <td class="noborder label table_header_v">Notiz</td>
-              <% description = F.no_none(entry.notiz).replace('\n', '<br>') %>
-              <td class="noborder table_row_v">${description | F.NA}</td>
+              <% description = F.nl_to_br(h.escape(F.NA(entry.notiz))) %>
+              <td class="noborder table_row_v">${description}</td>
           </tr>
       </tbody>
   </table>