From 82ac8dae3965830100411b869ad378bb03441dcb Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Fri, 10 Sep 2010 19:33:11 +0000 Subject: [PATCH] we should use absolute_url() instead of getPhysicalPath() to distinguish multiple virtual hosts. see http://www.erp5.org/HowToCreateANewWidget. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38276 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../WebSection_viewInlinePageRenderer.xml | 11 ++++------- bt5/erp5_web/bt/copyright_list | 2 +- bt5/erp5_web/bt/revision | 2 +- 3 files changed, 6 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 2ce17c3c4c..8cbea47daf 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 @@ -2,10 +2,7 @@ <ZopeData> <record id="1" aka="AAAAAAAAAAE="> <pickle> - <tuple> - <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> - <tuple/> - </tuple> + <global name="PythonScript" module="Products.PythonScripts.PythonScript"/> </pickle> <pickle> <dictionary> @@ -68,9 +65,9 @@ def getInlinePage(reference, language):\n return None\n \n from Products.ERP5Type.Cache import CachingMethod\n -web_site_path = context.getWebSectionValue().getPhysicalPath()\n +web_site_url = context.getWebSectionValue().absolute_url()\n getInlinePage = CachingMethod(getInlinePage, \n - id=(\'WebSection_getInlinePageRenderer\', web_site_path))\n + id=(\'WebSection_getInlinePageRenderer\', web_site_url))\n language = context.Localizer.get_selected_language()\n return getInlinePage(reference, language)\n </string> </value> @@ -115,7 +112,7 @@ return getInlinePage(reference, language)\n <string>CachingMethod</string> <string>_getattr_</string> <string>context</string> - <string>web_site_path</string> + <string>web_site_url</string> <string>language</string> </tuple> </value> diff --git a/bt5/erp5_web/bt/copyright_list b/bt5/erp5_web/bt/copyright_list index 5107f9c9be..9b89dfdfd2 100644 --- a/bt5/erp5_web/bt/copyright_list +++ b/bt5/erp5_web/bt/copyright_list @@ -1 +1 @@ -Copyright (c) 2006,2008 Nexedi SARL \ No newline at end of file +Copyright (c) 2006-2010 Nexedi SA \ No newline at end of file diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index 8ea0a3e6f1..1c4af3a933 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -971 \ No newline at end of file +972 \ No newline at end of file -- 2.30.9