[Mpuls-commits] r838 - in wasko/branches/2.0: . waskaweb/controllers

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-25 16:55:12 +0100 (Mon, 25 Jan 2010)
New Revision: 838

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/controllers/case.py
Log:
* waskaweb/controllers/case.py (CaseController.printAll):
get_rendered_page always returns unicode so don't convert the its
returnvalue to unicode again


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-25 15:43:53 UTC (rev 837)
+++ wasko/branches/2.0/ChangeLog	2010-01-25 15:55:12 UTC (rev 838)
@@ -1,5 +1,11 @@
 2010-01-25  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/controllers/case.py (CaseController.printAll):
+	get_rendered_page always returns unicode so don't convert the its
+	returnvalue to unicode again
+
+2010-01-25  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/model/case.py (CaseDigest.fields): New class variable
 	with a list of field descriptions
 	(CaseDigest._loadFromDB): Iterate over self.fields to read the

Modified: wasko/branches/2.0/waskaweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/waskaweb/controllers/case.py	2010-01-25 15:43:53 UTC (rev 837)
+++ wasko/branches/2.0/waskaweb/controllers/case.py	2010-01-25 15:55:12 UTC (rev 838)
@@ -368,7 +368,7 @@
         navigation = session.get('navigation.tree')
         if navigation:
             for item in navigation.getAllItems():
-                out.append(unicode(get_rendered_page(item.key), 'utf-8'))
+                out.append(get_rendered_page(item.key))
         c.formular = "".join(out)
         session['render_mode'] = render_mode 
         session.save()