Commit 42b53658 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

since r28326, getWebSiteValue() already exists. so we need to use...

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.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@28481 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 7baa2d30
...@@ -76,7 +76,7 @@ current_web_section_translated_portal_type = current_web_section.getTranslatedPo ...@@ -76,7 +76,7 @@ current_web_section_translated_portal_type = current_web_section.getTranslatedPo
action_dict = request.get(\'actions\', {}) # XXX actions needs to be renamed to action_dict\n action_dict = request.get(\'actions\', {}) # XXX actions needs to be renamed to action_dict\n
exchange_action_list = action_dict.get(\'object_exchange\', [])\n exchange_action_list = action_dict.get(\'object_exchange\', [])\n
button_action_list = action_dict.get(\'object_button\', [])\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 = request.get(\'http_parameters\', \'\')\n
http_parameters = http_parameters.replace(\'editable_mode\', \'dummy_editable_mode\')\n http_parameters = http_parameters.replace(\'editable_mode\', \'dummy_editable_mode\')\n
\n \n
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
here.Base_filterDuplicateActions(\n here.Base_filterDuplicateActions(\n
here.portal_actions.listFilteredActionsFor(here));\n here.portal_actions.listFilteredActionsFor(here));\n
dummy python:request.set(\'actions\', actions);\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 portal_type here/getPortalType">\n
\n \n
<!-- XXX is this really useful - called how many times ?? - tried to removed but failed -->\n <!-- XXX is this really useful - called how many times ?? - tried to removed but failed -->\n
......
840 841
\ No newline at end of file \ No newline at end of file
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
cleaninput python: cleaninput.replace(\'\\n\',\'\\x5C\\x6E\');\n cleaninput python: cleaninput.replace(\'\\n\',\'\\x5C\\x6E\');\n
cleaninput python: cleaninput.replace(\'\\xE2\\x80\\xA8\',\'\\\\u2028\');\n cleaninput python: cleaninput.replace(\'\\xE2\\x80\\xA8\',\'\\\\u2028\');\n
cleaninput python: cleaninput.replace(\'\\xE2\\x80\\xA9\',\'\\\\u2029\');\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 portal_url python: site_root.absolute_url();\n
server_url request/BASE0;\n server_url request/BASE0;\n
portal_path python: portal_url.replace(server_url, \'\') + \'/\';\n portal_path python: portal_url.replace(server_url, \'\') + \'/\';\n
......
808 809
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment