From cc10bdc684b812420374c3b38b10f401767a387a Mon Sep 17 00:00:00 2001 From: Yusei Tahara <yusei@nexedi.com> Date: Tue, 1 Jul 2008 13:13:15 +0000 Subject: [PATCH] 2008-07-01 * Fix WebSection_viewInlinePageRenderer. Prevent to get a non document object. Thank you for Thomas Nouret. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@22161 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../WebSection_viewInlinePageRenderer.xml | 17 +++++++++-------- bt5/erp5_web/bt/change_log | 3 +++ bt5/erp5_web/bt/revision | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewInlinePageRenderer.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewInlinePageRenderer.xml index 81c6f73d2f..5a636f93df 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewInlinePageRenderer.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSection_viewInlinePageRenderer.xml @@ -66,22 +66,23 @@ <item> <key> <string>_body</string> </key> <value> <string>"""\n - Cache and return a given Web Page as stripped HTML\n - Use reference and language as cache keys\n + Cache and return a given Web Page as stripped HTML\n + Use reference and language as cache keys\n \n - TODO: remove same script in KM (XXX)\n + TODO: remove same script in KM (XXX)\n """\n \n def getInlinePage(reference, language):\n - page = context.restrictedTraverse(reference)\n - if page is not None:\n - return page.asStrippedHTML()\n - return None\n + if reference:\n + page = context.restrictedTraverse(reference)\n + if page is not None:\n + return page.asStrippedHTML()\n + return None\n \n from Products.ERP5Type.Cache import CachingMethod\n web_site_path = context.getWebSectionValue().getPhysicalPath()\n getInlinePage = CachingMethod(getInlinePage, \n - id=(\'WebSection_getInlinePageRenderer\', web_site_path))\n + id=(\'WebSection_getInlinePageRenderer\', web_site_path))\n language = context.Localizer.get_selected_language()\n return getInlinePage(reference, language)\n </string> </value> diff --git a/bt5/erp5_web/bt/change_log b/bt5/erp5_web/bt/change_log index 68c0bd1d6d..4ba8af1914 100644 --- a/bt5/erp5_web/bt/change_log +++ b/bt5/erp5_web/bt/change_log @@ -1,3 +1,6 @@ +2008-07-01 +* Fix WebSection_viewInlinePageRenderer. Prevent to get a non document object. Thank you for Thomas Nouret. + 2008-06-28 yo * Use restrictedTraverse instead of getDocumentValue in WebSection_viewInlinePageRenderer, because we need an appropriate acquisition wrapper here. diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index acec591c56..8e6ba7fb6c 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -674 \ No newline at end of file +675 \ No newline at end of file -- 2.30.9