[Erp5-report] r37380 jerome - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: Skin...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Jul 30 14:41:56 CEST 2010
Author: jerome
Date: Fri Jul 30 14:41:53 2010
New Revision: 37380
URL: http://svn.erp5.org?rev=37380&view=rev
Log:
always use dialog actions from REQUEST['object_path'], this way when an action is based on another context, we still have other dialog actions from the original context
Modified:
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doDialog.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml
erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doDialog.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doDialog.xml?rev=37380&r1=37379&r2=37380&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doDialog.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doDialog.xml [utf8] Fri Jul 30 14:41:53 2010
@@ -61,7 +61,13 @@ if Base_updateListboxSelection is not No
Base_updateListboxSelection()\n
\n
kw.update(context.REQUEST.form)\n
-return context.ERP5Site_redirect(select_dialog.split()[0], keep_items={\'dialog_category\': dialog_category, \'form_id\': form_id, \'cancel_url\': cancel_url}, **kw)\n
+keep_items=dict(\n
+ dialog_category=dialog_category,\n
+ form_id=form_id,\n
+ cancel_url=cancel_url,\n
+ object_path=object_path)\n
+\n
+return context.ERP5Site_redirect(select_dialog.split()[0], keep_items=keep_items, **kw)\n
</string> </value>
</item>
<item>
@@ -72,7 +78,7 @@ return context.ERP5Site_redirect(select_
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>select_dialog, dialog_category, form_id, cancel_url, **kw</string> </value>
+ <value> <string>select_dialog, dialog_category, form_id, cancel_url, object_path, **kw</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -92,7 +98,7 @@ return context.ERP5Site_redirect(select_
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>4</int> </value>
+ <value> <int>5</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
@@ -102,12 +108,15 @@ return context.ERP5Site_redirect(select_
<string>dialog_category</string>
<string>form_id</string>
<string>cancel_url</string>
+ <string>object_path</string>
<string>kw</string>
<string>getattr</string>
<string>context</string>
<string>None</string>
<string>Base_updateListboxSelection</string>
<string>_getattr_</string>
+ <string>dict</string>
+ <string>keep_items</string>
<string>_apply_</string>
<string>_getitem_</string>
</tuple>
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml?rev=37380&r1=37379&r2=37380&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/dialog_main.xml [utf8] Fri Jul 30 14:41:53 2010
@@ -51,7 +51,7 @@
global dialog_category request/dialog_category | nothing;\n
\n
local_parameter_list local_parameter_list | python: {};\n
- dummy python: local_parameter_list.update({\'dialog_id\': dialog_id, \'dialog_method\': dialog_method, \'update_method\': update_action, \'dialog_category\': dialog_category, \'cancel_url\': request.get(\'cancel_url\'), \'form_id\': form_id});\n
+ dummy python: local_parameter_list.update({\'dialog_id\': dialog_id, \'dialog_method\': dialog_method, \'update_method\': update_action, \'dialog_category\': dialog_category, \'cancel_url\': request.get(\'cancel_url\'), \'form_id\': form_id, \'object_path\': request.get(\'object_path\', context.getPath())});\n
title python: here.Base_translateString(here.Base_getFormViewDialogActionButtonTitle(form))">\n
<tal:block metal:use-macro="here/main_template/macros/master">\n
<tal:block metal:fill-slot="main">\n
Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml?rev=37380&r1=37379&r2=37380&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/global_definitions.xml [utf8] Fri Jul 30 14:41:53 2010
@@ -47,8 +47,9 @@
<tal:block tal:define="\n
global portal here/portal_url/getPortalObject;\n
global portal_path portal/absolute_url;\n
- local_parameter_list local_parameter_list | python: {};\n
- global actions python: here.Base_filterDuplicateActions(portal.portal_actions.listFilteredActionsFor(here));\n
+ local_parameter_list local_parameter_list | python: {};\n
+ action_context python: portal.restrictedTraverse(request.get(\'object_path\', \'?\'), here);\n
+ global actions python: here.Base_filterDuplicateActions(portal.portal_actions.listFilteredActionsFor(action_context));\n
global url here/absolute_url;\n
global current_form_id python: local_parameter_list.get(\'dialog_id\', local_parameter_list.get(\'form_id\', \'view\'));\n
dummy python: request.set(\'current_form_id\', current_form_id);\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=37380&r1=37379&r2=37380&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] Fri Jul 30 14:41:53 2010
@@ -1 +1 @@
-967
\ No newline at end of file
+968
\ No newline at end of file
More information about the Erp5-report
mailing list