[Mpuls-commits] r3820 - in base/trunk: . mpulsweb/templates/casemanagement mpulsweb/templates/phase
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Sep 29 11:19:08 CEST 2010
Author: torsten
Date: 2010-09-29 11:19:04 +0200 (Wed, 29 Sep 2010)
New Revision: 3820
Modified:
base/trunk/ChangeLog
base/trunk/mpulsweb/templates/casemanagement/digest.mako
base/trunk/mpulsweb/templates/casemanagement/main.mako
base/trunk/mpulsweb/templates/phase/phase.mako
Log:
Issue1027: Do not escape phase names as the can include html "­"
Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog 2010-09-29 08:52:04 UTC (rev 3819)
+++ base/trunk/ChangeLog 2010-09-29 09:19:04 UTC (rev 3820)
@@ -1,3 +1,12 @@
+2010-09-29 Torsten Irländer <torsten.irlaender at intevation.de>
+
+ Issue1027:
+ * mpulsweb/templates/phase/phase.mako,
+ mpulsweb/templates/casemanagement/digest.mako,
+ mpulsweb/templates/casemanagement/main.mako: Do not escape name of
+ the phase in templates as it can include html "­" to divide long
+ phasenames.
+
2010-09-28 Bernhard Herzog <bh at intevation.de>
* mpulsweb/lib/search.py (CaseSearch.get_allowed_viewer_clause):
Modified: base/trunk/mpulsweb/templates/casemanagement/digest.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/digest.mako 2010-09-29 08:52:04 UTC (rev 3819)
+++ base/trunk/mpulsweb/templates/casemanagement/digest.mako 2010-09-29 09:19:04 UTC (rev 3820)
@@ -115,7 +115,7 @@
% endif
<tr class="hl">
<td class="label">${_('Phase')}</td>
- <td>${c.case.getState().getPhaseDescription()}</td>
+ <td>${h.literal(c.case.getState().getPhaseDescription())}</td>
</tr>
% if g.mpuls_config.is_enabled('case-module', 'tags'):
<tr class="">
@@ -141,7 +141,7 @@
<% if phase.id == "-1" and g.mpuls_config.is_enabled('phases', 'hideunknown'): continue %>
% if phase.getStart().id in reachable or phase.getEnd().id in reachable:
<li>
- ${phase.description}<br>
+ ${h.literal(phase.description)}<br>
<span class="info">
${_('Start date')}: ${h.format_date(phase.getStart().date) | F.NA}<br>
${_('End date')}: ${h.format_date(phase.getEnd().date) | F.NA}<br>
Modified: base/trunk/mpulsweb/templates/casemanagement/main.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/main.mako 2010-09-29 08:52:04 UTC (rev 3819)
+++ base/trunk/mpulsweb/templates/casemanagement/main.mako 2010-09-29 09:19:04 UTC (rev 3820)
@@ -24,7 +24,7 @@
${h.shorten(case.get_value(f.alias), 15) | F.NA}
<br>
% endfor
- <strong>${_('cm_info_phase')}:</strong> ${ case.getState().getPhaseDescription() | F.NA}<br>
+ <strong>${_('cm_info_phase')}:</strong> ${ h.literal(case.getState().getPhaseDescription()) | F.NA}<br>
<strong>${_('cm_info_status')}:</strong>
${case.getState().getStateLabel() | F.NA}<br>
</div>
Modified: base/trunk/mpulsweb/templates/phase/phase.mako
===================================================================
--- base/trunk/mpulsweb/templates/phase/phase.mako 2010-09-29 08:52:04 UTC (rev 3819)
+++ base/trunk/mpulsweb/templates/phase/phase.mako 2010-09-29 09:19:04 UTC (rev 3820)
@@ -43,7 +43,7 @@
or current_phase == '-1':
<tr class="${(num%2) and 'hl' or ''}">
<td rowspan="2" class="bold center middle">
- ${phase.getDescription()}<br>
+ ${h.literal(phase.getDescription())}<br>
<span class="note">
% if p1.is_active():
${_('Running')}
@@ -142,7 +142,7 @@
if t: total = total and (total + t) or t
%>
<tr class="${num%2 and 'hl' or ''}">
- <td>${phase.getDescription()}</td>
+ <td>${h.literal(phase.getDescription())}</td>
<td class="actions">${h.NA(h.timedelta_in_weeks(t))}</td>
</tr>
% endfor
More information about the Mpuls-commits
mailing list