[Erp5-report] r39226 ivan - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: ivan
Date: Fri Oct 15 13:59:27 2010
New Revision: 39226

URL: http://svn.erp5.org?rev=39226&view=rev
Log:
Revert r39223 ass due to different Zope PT's implementation we require explicit conversion.

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml?rev=39226&r1=39225&r2=39226&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml [utf8] Fri Oct 15 13:59:27 2010
@@ -88,6 +88,8 @@ portal_type = context.getTranslatedPorta
 website = context.REQUEST.get(\'current_web_site\', context.getWebSiteValue())\n
 \n
 popup = context.Document_getPopupInfo(website) or \'\'\n
+if isinstance(popup, unicode):\n
+  popup = popup.encode(\'utf-8\')\n
 \n
 found = context.Base_showFoundText()\n
 owner_html = getOwnerHTML(context) or \'\'\n
@@ -191,6 +193,8 @@ return html\n
                             <string>title</string>
                             <string>portal_type</string>
                             <string>popup</string>
+                            <string>isinstance</string>
+                            <string>unicode</string>
                             <string>found</string>
                             <string>owner_html</string>
                             <string>date_renderer</string>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=39226&r1=39225&r2=39226&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Fri Oct 15 13:59:27 2010
@@ -1 +1 @@
-886
\ No newline at end of file
+887
\ No newline at end of file