[Mpuls-commits] r3017 - in base/trunk: . mpulsweb/templates/settings mpulsweb/templates/usersettings

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-06-15 20:22:51 +0200 (Tue, 15 Jun 2010)
New Revision: 3017

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/settings/edit.mako
   base/trunk/mpulsweb/templates/usersettings/change_password_login.mako
Log:
* mpulsweb/templates/settings/edit.mako,
* mpulsweb/templates/usersettings/change_password_login.mako:
Avoid double HTML escaping


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-06-15 18:20:53 UTC (rev 3016)
+++ base/trunk/ChangeLog	2010-06-15 18:22:51 UTC (rev 3017)
@@ -1,6 +1,12 @@
 2010-06-15  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/templates/settings/edit.mako,
+	* mpulsweb/templates/usersettings/change_password_login.mako:
+	Avoid double HTML escaping
+
+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

Modified: base/trunk/mpulsweb/templates/settings/edit.mako
===================================================================
--- base/trunk/mpulsweb/templates/settings/edit.mako	2010-06-15 18:20:53 UTC (rev 3016)
+++ base/trunk/mpulsweb/templates/settings/edit.mako	2010-06-15 18:22:51 UTC (rev 3017)
@@ -48,11 +48,11 @@
           <label for="ka_name">${_('adm_form_settings_kaname')}</label>
           % if c.form_errors.get('ka_name'):
             <input type="text" class="field error_box" id="ka_name"
-                   value="${c.form_result.get('ka_name', c.agency.getName())|h}"
+                   value="${c.form_result.get('ka_name', c.agency.getName())}"
                    name="ka_name" maxlength="60">
           % else:
             <input type="text" class="field" id="ka_name" name="ka_name"
-                   value="${c.form_result.get('ka_name', c.agency.getName())|h}"
+                   value="${c.form_result.get('ka_name', c.agency.getName())}"
                    maxlength="60">
           % endif
         </div>
@@ -60,11 +60,11 @@
           <label for="ka_adresse">${_('adm_form_settings_kaadress')}</label>
           % if c.form_errors.get('ka_adresse'):
             <input type="text" class="field error_box" id="ka_adresse"
-                   value="${c.form_result.get('ka_adresse', c.agency.getAddress())|h}"
+                   value="${c.form_result.get('ka_adresse', c.agency.getAddress())}"
                    name="ka_adresse" maxlength="120">
           % else:
             <input type="text" class="field" id="ka_adresse" name="ka_adresse"
-                   value="${c.form_result.get('ka_adresse', c.agency.getAddress())|h}"
+                   value="${c.form_result.get('ka_adresse', c.agency.getAddress())}"
                    maxlength="120">
           % endif
         </div>

Modified: base/trunk/mpulsweb/templates/usersettings/change_password_login.mako
===================================================================
--- base/trunk/mpulsweb/templates/usersettings/change_password_login.mako	2010-06-15 18:20:53 UTC (rev 3016)
+++ base/trunk/mpulsweb/templates/usersettings/change_password_login.mako	2010-06-15 18:22:51 UTC (rev 3017)
@@ -34,7 +34,7 @@
           % endif
 	</div>
 	</fieldset>
-	<input type="hidden" name="uid" value="${h.getUserId() | h}">
+	<input type="hidden" name="uid" value="${h.getUserId()}">
 	<input type="submit" value="${_('adm_form_changepassword_submit')}">
 </form>
 </div>