[Erp5-report] r42900 jerome - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: Skin...

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Feb  1 17:08:32 2011
New Revision: 42900

URL: http://svn.erp5.org?rev=42900&view=rev
Log:
calculate actions from actual context

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doReport.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_doReport.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doReport.xml?rev=42900&r1=42899&r2=42900&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doReport.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_doReport.xml [utf8] Tue Feb  1 17:08:32 2011
@@ -53,19 +53,24 @@
             <value> <string>request = container.REQUEST\n
 kw.update(request.form)\n
 \n
+portal = context.getPortalObject()\n
+\n
 # Base_updateListboxSelection cannot be found.\n
 Base_updateListboxSelection = getattr(context, \'Base_updateListboxSelection\', None)\n
 if Base_updateListboxSelection is not None:\n
   Base_updateListboxSelection()\n
 \n
+action_context = portal.restrictedTraverse(request.get(\'object_path\', \'?\'), context)\n
+\n
 new_print_action_list = context.Base_fixDialogActions(\n
      context.Base_filterDuplicateActions(\n
-     context.portal_actions.listFilteredActionsFor(context)), \'object_report\')\n
+     portal.portal_actions.listFilteredActionsFor(action_context)), \'object_report\')\n
 \n
 if new_print_action_list:\n
   return context.ERP5Site_redirect(new_print_action_list[0][\'url\'],\n
                                                            keep_items={\'form_id\': form_id,\n
                                                            \'cancel_url\': cancel_url,\n
+                                                           \'object_path\': request.get(\'object_path\', context.getPath()),\n
                                                            \'dialog_category\': \'object_report\'}, **kw)\n
 </string> </value>
         </item>

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=42900&r1=42899&r2=42900&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] Tue Feb  1 17:08:32 2011
@@ -1 +1 @@
-1058
\ No newline at end of file
+1059
\ No newline at end of file