[Mpuls-commits] r4367 - in waska/trunk: . waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-12-14 11:22:45 +0100 (Tue, 14 Dec 2010)
New Revision: 4367

Modified:
   waska/trunk/ChangeLog
   waska/trunk/waskaweb/templates/casemanagement/digest_body.mako
Log:
* waskaweb/templates/casemanagement/digest_body.mako: When
converting field values to html, call convertForDigest first to
convert the value to a string and then call nl_to_br on the
result, not the other way round.


Modified: waska/trunk/ChangeLog
===================================================================
--- waska/trunk/ChangeLog	2010-12-14 08:28:32 UTC (rev 4366)
+++ waska/trunk/ChangeLog	2010-12-14 10:22:45 UTC (rev 4367)
@@ -1,3 +1,10 @@
+2010-12-14  Bernhard Herzog  <bh at intevation.de>
+
+	* waskaweb/templates/casemanagement/digest_body.mako: When
+	converting field values to html, call convertForDigest first to
+	convert the value to a string and then call nl_to_br on the
+	result, not the other way round.
+
 2010-12-13  Roland Geider <roland.geider at intevation.de>
 
 	* waskaweb/templates/casemanagement/digest_body.mako: issue1550: also

Modified: waska/trunk/waskaweb/templates/casemanagement/digest_body.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/digest_body.mako	2010-12-14 08:28:32 UTC (rev 4366)
+++ waska/trunk/waskaweb/templates/casemanagement/digest_body.mako	2010-12-14 10:22:45 UTC (rev 4367)
@@ -9,7 +9,7 @@
       % if field.name in ['kundennummer', 'name_1', 'vorname_1', 'geburtsdatum', 'strasse', 'strassenr', 'plz', 'wohnort', 'vorwahl', 'telefon_1', 'mobiltelefon', 'telefon_sonstige', 'email']:
         <tr class="${num % 2 and 'hl' or ''}">
           <td class="label">${c.case.get_description(field.name)}</td>
-          <td>${h.literal(h.convertForDigest(h.nl_to_br(c.case.get_value(field.name))))| F.NA}
+          <td>${h.literal(h.nl_to_br(h.convertForDigest(c.case.get_value(field.name))))| F.NA}
             % if field.name == 'geburtsdatum' and c.case.first_meeting:
             (${_('Age on first contact: %s years') %h.get_age(c.case.first_meeting - c.case.get_value(field.name)) | F.NA})
             % endif