[Erp5-report] r28481 - in /erp5/trunk: bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Aug 20 10:32:26 2009
New Revision: 28481

URL: http://svn.erp5.org?rev=28481&view=rev
Log:
since r28326, getWebSiteValue() already exists. so we need to use "here.getWebSiteValue() or here.getPortalObject()" instead of "getattr(here, 'getWebSiteValue', here.getPortalObject)()". thanks ro Romain for notifying this bug.

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
    erp5/trunk/bt5/erp5_web/bt/revision
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml?rev=28481&r1=28480&r2=28481&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/Base_getAdminToolboxEditShortcutList.xml [utf8] Thu Aug 20 10:32:26 2009
@@ -76,7 +76,7 @@
 action_dict = request.get(\'actions\', {}) # XXX actions needs to be renamed to action_dict\n
 exchange_action_list = action_dict.get(\'object_exchange\', [])\n
 button_action_list = action_dict.get(\'object_button\', [])\n
-portal_url = getattr(context, \'getWebSiteValue\', context.getPortalObject)().absolute_url()\n
+portal_url = (context.getWebSiteValue() or context.getPortalObject()).absolute_url()\n
 http_parameters = request.get(\'http_parameters\', \'\')\n
 http_parameters = http_parameters.replace(\'editable_mode\', \'dummy_editable_mode\')\n
 \n

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml?rev=28481&r1=28480&r2=28481&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/admin_toolbox.xml [utf8] Thu Aug 20 10:32:26 2009
@@ -55,7 +55,7 @@
                            here.Base_filterDuplicateActions(\n
                              here.portal_actions.listFilteredActionsFor(here));\n
               dummy        python:request.set(\'actions\', actions);\n
-              portal_url   python: getattr(here, \'getWebSiteValue\', here.getPortalObject)().absolute_url();\n
+              portal_url   python: (here.getWebSiteValue() or here.getPortalObject()).absolute_url();\n
               portal_type  here/getPortalType">\n
 \n
   <!-- XXX is this really useful - called how many times ?? - tried to removed but failed -->\n

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=28481&r1=28480&r2=28481&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision [utf8] Thu Aug 20 10:32:26 2009
@@ -1,1 +1,1 @@
-840
+841

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml?rev=28481&r1=28480&r2=28481&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_fckeditor/fckeditor_wysiwyg_support.xml [utf8] Thu Aug 20 10:32:26 2009
@@ -46,7 +46,7 @@
                        cleaninput         python: cleaninput.replace(\'\\n\',\'\\x5C\\x6E\');\n
                        cleaninput         python: cleaninput.replace(\'\\xE2\\x80\\xA8\',\'\\\\u2028\');\n
                        cleaninput         python: cleaninput.replace(\'\\xE2\\x80\\xA9\',\'\\\\u2029\');\n
-                       site_root          python: getattr(here, \'getWebSiteValue\', here.getPortalObject)();\n
+                       site_root          python: here.getWebSiteValue() or here.getPortalObject();\n
                        portal_url         python: site_root.absolute_url();\n
                        server_url         request/BASE0;\n
                        portal_path        python: portal_url.replace(server_url, \'\') + \'/\';\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=28481&r1=28480&r2=28481&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Thu Aug 20 10:32:26 2009
@@ -1,1 +1,1 @@
-808
+809