[Mpuls-commits] r2361 - in wasko/branches/2.0: . mpulsweb/controllers

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-04-15 10:12:09 +0200 (Thu, 15 Apr 2010)
New Revision: 2361

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/controllers/appointment.py
   wasko/branches/2.0/mpulsweb/controllers/case.py
   wasko/branches/2.0/mpulsweb/controllers/casedocument.py
   wasko/branches/2.0/mpulsweb/controllers/document.py
Log:
removed unneeded unicode() function calls

Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-04-15 08:04:55 UTC (rev 2360)
+++ wasko/branches/2.0/ChangeLog	2010-04-15 08:12:09 UTC (rev 2361)
@@ -1,5 +1,14 @@
 2010-04-15  Roland Geider <roland.geider at intevation.de>
 
+	* mpulsweb/controllers/appointment.py:
+	* mpulsweb/controllers/casedocument.py:
+	* mpulsweb/controllers/case.py:
+	* mpulsweb/controllers/document.py:
+	* mpulsweb/templates/main.mako: removed unneeded unicode() function calls
+
+
+2010-04-15  Roland Geider <roland.geider at intevation.de>
+
 	* mpulsweb/templates/main.mako:
 	* mpulsweb/model/user.py: Fixed Wald issue #1352: Added tooltip to username
         and changed displayed role of "adm" user

Modified: wasko/branches/2.0/mpulsweb/controllers/appointment.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/appointment.py	2010-04-15 08:04:55 UTC (rev 2360)
+++ wasko/branches/2.0/mpulsweb/controllers/appointment.py	2010-04-15 08:12:09 UTC (rev 2361)
@@ -83,7 +83,7 @@
                            'start_time': HH_MM(cd),
                            'case_id': None}
         form = render('/appointments/new.mako')
-        return formencode.htmlfill.render(unicode(form, 'utf-8'),
+        return formencode.htmlfill.render(form,
                                           defaults=c.form_defaults)
 
     @checkRole(('admin_ka'))
@@ -106,7 +106,7 @@
             c.form_result = error.value
             c.form_errors = error.error_dict or {}
             form = render('/appointments/new.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)
@@ -133,7 +133,7 @@
 
         c.form_errors = {}
         form = render('/appointments/edit.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)
@@ -158,7 +158,7 @@
             c.form_result = error.value
             c.form_errors = error.error_dict or {}
             form = render('/appointments/edit.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)

Modified: wasko/branches/2.0/mpulsweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/case.py	2010-04-15 08:04:55 UTC (rev 2360)
+++ wasko/branches/2.0/mpulsweb/controllers/case.py	2010-04-15 08:12:09 UTC (rev 2361)
@@ -249,7 +249,7 @@
         session['render_mode'] = 'ro'
         session.save()
         digest = render('/casemanagement/digest_body.mako')
-        out.append(unicode(digest, 'utf-8'))
+        out.append(digest)
         navigation = session.get('navigation.tree')
         if navigation:
             for item in navigation.getAllItems():

Modified: wasko/branches/2.0/mpulsweb/controllers/casedocument.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/casedocument.py	2010-04-15 08:04:55 UTC (rev 2360)
+++ wasko/branches/2.0/mpulsweb/controllers/casedocument.py	2010-04-15 08:12:09 UTC (rev 2361)
@@ -76,7 +76,7 @@
             c.form_errors = error.error_dict or {}
             log.debug(c.form_result)
             form = render('/documents/case_new.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)

Modified: wasko/branches/2.0/mpulsweb/controllers/document.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/document.py	2010-04-15 08:04:55 UTC (rev 2360)
+++ wasko/branches/2.0/mpulsweb/controllers/document.py	2010-04-15 08:12:09 UTC (rev 2361)
@@ -113,7 +113,7 @@
             c.form_errors = error.error_dict or {}
             log.debug(c.form_result)
             form = render('/documents/global_upload.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)