Commit d97d827a authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

* back to 'view' instead of 'WebSite_view', 'WebSection_view' or...

* back to 'view' instead of 'WebSite_view', 'WebSection_view' or 'WebPage_view' in 'Save & View' action.
* fix getting ignore_layout parameter in Base_editRelation for web mode.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@27666 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e3865bf2
...@@ -261,6 +261,12 @@ spp.insert(0,s_url)\n ...@@ -261,6 +261,12 @@ spp.insert(0,s_url)\n
#calculate direct the url instead of using absolute_url\n #calculate direct the url instead of using absolute_url\n
new_url = \'/\'.join(spp)\n new_url = \'/\'.join(spp)\n
\n \n
# for web mode, we should use \'view\' instead of \'WebSite_view\',\n
# \'WebSection_view\' or \'WebPage_view\'.\n
if context.REQUEST.get(\'is_web_mode\', False) and \\\n
form_id in (\'WebSite_view\', \'WebSection_view\', \'WebPage_view\'):\n
form_id = \'view\'\n
\n
if not selection_index:\n if not selection_index:\n
redirect_url = \'%s/%s?ignore_layout:int=%s&editable_mode:int=%s&portal_status_message=%s\' % (\n redirect_url = \'%s/%s?ignore_layout:int=%s&editable_mode:int=%s&portal_status_message=%s\' % (\n
context.absolute_url(),\n context.absolute_url(),\n
...@@ -374,6 +380,7 @@ return result\n ...@@ -374,6 +380,7 @@ return result\n
<string>list</string> <string>list</string>
<string>s_url</string> <string>s_url</string>
<string>new_url</string> <string>new_url</string>
<string>False</string>
<string>result</string> <string>result</string>
</tuple> </tuple>
</value> </value>
......
...@@ -92,7 +92,7 @@ for k in request_form.keys():\n ...@@ -92,7 +92,7 @@ for k in request_form.keys():\n
request.form.update(old_request)\n request.form.update(old_request)\n
edit_method = getattr(context, request_form.get(\'form_action\', \'Base_edit\'))\n edit_method = getattr(context, request_form.get(\'form_action\', \'Base_edit\'))\n
return edit_method(form_id,\n return edit_method(form_id,\n
ignore_layout=old_request.get(\'ignore_layout\', True),\n ignore_layout=request.get(\'ignore_layout\', True),\n
selection_index=old_request.get(\'selection_index\', 0),\n selection_index=old_request.get(\'selection_index\', 0),\n
selection_name=old_request.get(\'selection_name\', \'\'))\n selection_name=old_request.get(\'selection_name\', \'\'))\n
......
1237 1238
\ 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