[Mpuls-commits] r3016 - in base/trunk: . mpulsweb/templates/casemanagement mpulsweb/templates/settings

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-06-15 20:20:53 +0200 (Tue, 15 Jun 2010)
New Revision: 3016

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/casemanagement/organisation.mako
   base/trunk/mpulsweb/templates/casemanagement/search.mako
   base/trunk/mpulsweb/templates/settings/edit.mako
Log:
* mpulsweb/templates/settings/edit.mako,
mpulsweb/templates/casemanagement/organisation.mako,
mpulsweb/templates/casemanagement/search.mako: Avoid double HTML
escaping


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-06-15 18:09:07 UTC (rev 3015)
+++ base/trunk/ChangeLog	2010-06-15 18:20:53 UTC (rev 3016)
@@ -1,5 +1,12 @@
 2010-06-15  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/settings/edit.mako,
+	mpulsweb/templates/casemanagement/organisation.mako,
+	mpulsweb/templates/casemanagement/search.mako: Avoid double HTML
+	escaping
+
+2010-06-15  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/templates/logbook/edit_body.mako,
 	mpulsweb/templates/logbook/overview.mako,
 	mpulsweb/templates/logbook/overview_print.mako,

Modified: base/trunk/mpulsweb/templates/casemanagement/organisation.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/organisation.mako	2010-06-15 18:09:07 UTC (rev 3015)
+++ base/trunk/mpulsweb/templates/casemanagement/organisation.mako	2010-06-15 18:20:53 UTC (rev 3016)
@@ -52,16 +52,16 @@
   <tr>
   % if idset:
     % if group.id in c.standin.getGroups():
-     <td><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}" checked></td>
+     <td><input type="checkbox" name="standin-${group.id}" value="${group.id}" checked></td>
     % else:
-     <td><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}"></td>
+     <td><input type="checkbox" name="standin-${group.id}" value="${group.id}"></td>
     % endif
      <td>${group.name | F.NA}</td>
   % else:
     % if group.id in c.standin.getGroups():
-     <td class="table_row_v_12"><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}" checked></td>
+     <td class="table_row_v_12"><input type="checkbox" name="standin-${group.id}" value="${group.id}" checked></td>
     % else:
-     <td class="table_row_v_12"><input type="checkbox" name="standin-${group.id | h}" value="${group.id | h}"></td>
+     <td class="table_row_v_12"><input type="checkbox" name="standin-${group.id}" value="${group.id}"></td>
     % endif
      <td class="table_row_v_12">${group.name | F.NA}</td>
   % endif

Modified: base/trunk/mpulsweb/templates/casemanagement/search.mako
===================================================================
--- base/trunk/mpulsweb/templates/casemanagement/search.mako	2010-06-15 18:09:07 UTC (rev 3015)
+++ base/trunk/mpulsweb/templates/casemanagement/search.mako	2010-06-15 18:20:53 UTC (rev 3016)
@@ -167,7 +167,7 @@
 ##          <select name="editor" id="editor">
 ##            <option value="-1">Alle Benutzer</option>
 ##          % for user in c.userlist:
-##            <option value="${user.id}">${user.last_name | h}, ${user.first_name | h}</option>
+##            <option value="${user.id}">${user.last_name}, ${user.first_name}</option>
 ##          % endfor
 ##          </select>
 ##        </td>

Modified: base/trunk/mpulsweb/templates/settings/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/edit.mako	2010-06-15 18:09:07 UTC (rev 3015)
+++ base/trunk/mpulsweb/templates/settings/edit.mako	2010-06-15 18:20:53 UTC (rev 3016)
@@ -72,11 +72,11 @@
           <label for="fkz">${_('adm_form_settings_fkz')}</label>
           % if c.form_errors.get('fkz'):
             <input type="text" class="error_box" id="fkz" name="fkz"
-                   value="${c.form_result.get('fkz', c.agency.getFKZ())| h}"
+                   value="${c.form_result.get('fkz', c.agency.getFKZ())}"
                    maxlength="60">
           % else:
             <input type="text" id="fkz" name="fkz"
-                   value="${c.form_result.get('fkz', c.agency.getFKZ())| h}"
+                   value="${c.form_result.get('fkz', c.agency.getFKZ())}"
                    maxlength="60">
           % endif
         </div>
@@ -91,12 +91,12 @@
             <input type="text" class="error_box" id="max_speicherdauer"
                    name="max_speicherdauer"
                    value="${c.form_result.get('max_speicherdauer',
-                                              c.agency.getMaxSavetime()) | h}"
+                                              c.agency.getMaxSavetime())}"
                    maxlength="4">
           % else:
             <input type="text" id="max_speicherdauer" name="max_speicherdauer"
                    value="${c.form_result.get('max_speicherdauer',
-                                              c.agency.getMaxSavetime())| h}"
+                                              c.agency.getMaxSavetime())}"
                    maxlength="4">
           % endif
           <p class="info">