[Mpuls-commits] r2058 - wasko/branches/2.0/jmdweb/controllers

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-03-23 09:00:24 +0100 (Tue, 23 Mar 2010)
New Revision: 2058

Modified:
   wasko/branches/2.0/jmdweb/controllers/caseappointment.py
Log:
* jmdweb/controllers/caseappointment.py: Render already returns
unicode, so d not convert it to unicode again.


Modified: wasko/branches/2.0/jmdweb/controllers/caseappointment.py
===================================================================
--- wasko/branches/2.0/jmdweb/controllers/caseappointment.py	2010-03-23 07:56:11 UTC (rev 2057)
+++ wasko/branches/2.0/jmdweb/controllers/caseappointment.py	2010-03-23 08:00:24 UTC (rev 2058)
@@ -52,7 +52,7 @@
                          'case_id': id,
                          'type': 0}
         form = render('/casemanagement/newAppointment.mako')
-        return formencode.htmlfill.render(unicode(form, 'utf-8'),
+        return formencode.htmlfill.render(form,
                                           defaults=form_defaults)
 
     @checkRole('cm_ka')
@@ -70,7 +70,7 @@
                                          u" die Wiedervorlage ein"),
                          'type': 1}
         form = render('/casemanagement/newAppointment.mako')
-        return formencode.htmlfill.render(unicode(form, 'utf-8'),
+        return formencode.htmlfill.render(form,
                                           defaults=form_defaults)
 
     @checkRole(('cm_ka'))
@@ -95,7 +95,7 @@
                 c.form_result = error.value
                 c.form_errors = error.error_dict or {}
                 form = render('/casemanagement/newAppointment.mako')
-                return formencode.htmlfill.render(unicode(form, 'utf-8'),
+                return formencode.htmlfill.render(form,
                                                   defaults=form_result,
                                                   auto_insert_errors=False,
                                                   errors=form_errors)
@@ -139,7 +139,7 @@
         c.form_errors = {}
         c.appointment = app
         form = render('/casemanagement/editAppointment.mako')
-        return formencode.htmlfill.render(unicode(form, 'utf-8'),
+        return formencode.htmlfill.render(form, 'utf-8',
                                           defaults=c.form_result,
                                           auto_insert_errors=False,
                                           errors=c.form_errors)
@@ -168,7 +168,7 @@
                 c.form_errors = error.error_dict or {}
                 c.appointment = factory.loadById(c.form_result.get('id'))
                 form = render('/casemanagement/editAppointment.mako')
-                return formencode.htmlfill.render(unicode(form, 'utf-8'),
+                return formencode.htmlfill.render(form,
                                                   defaults=c.form_result,
                                                   auto_insert_errors=False,
                                                   errors=c.form_errors)