[Erp5-report] r25097 - in /erp5/trunk/bt5/erp5_deferred_style: SkinTemplateItem/portal_skin...

[nobody at svn.erp5.org]

Author: romain
Date: Wed Jan 14 11:01:17 2009
New Revision: 25097

URL: http://svn.erp5.org?rev=25097&view=rev
Log:
Allow to change the format generated by deferred style.

Modified:
    erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_activateReport.xml
    erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_report.xml
    erp5/trunk/bt5/erp5_deferred_style/bt/revision

Modified: erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_activateReport.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_activateReport.xml?rev=25097&r1=25096&r2=25097&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_activateReport.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_activateReport.xml [utf8] Wed Jan 14 11:01:17 2009
@@ -56,6 +56,9 @@
             <value> <string>request = container.REQUEST\n
 RESPONSE =  request.RESPONSE\n
 \n
+format = request.get(\'format\', \'pdf\')\n
+skin_name = request.get(\'skin_name\', \'ODT\')\n
+\n
 portal = context.getPortalObject()\n
 N_ = portal.Base_translateString\n
 \n
@@ -74,7 +77,6 @@
 active_process = portal.portal_activities.newActiveProcess()\n
 user_name = context.portal_membership.getAuthenticatedMember().getUserName()\n
 \n
-skin_name = \'ODT\' # XXX hardcoded for now\n
 tag = \'active-report-%s\' % random.randint(0, 1000)\n
 priority = 3\n
 \n
@@ -116,6 +118,7 @@
            request_other=request_other,\n
            form_path=form.getPhysicalPath(),\n
            user_name=user_name,\n
+           format=format,\n
           )\n
 \n
 context.activate(activity=\'SQLQueue\', after_tag=tag).getTitle()\n
@@ -174,6 +177,8 @@
                             <string>container</string>
                             <string>request</string>
                             <string>RESPONSE</string>
+                            <string>format</string>
+                            <string>skin_name</string>
                             <string>context</string>
                             <string>portal</string>
                             <string>N_</string>
@@ -183,7 +188,6 @@
                             <string>dict</string>
                             <string>active_process</string>
                             <string>user_name</string>
-                            <string>skin_name</string>
                             <string>random</string>
                             <string>tag</string>
                             <string>priority</string>

Modified: erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_report.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_report.xml?rev=25097&r1=25096&r2=25097&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_report.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_report.xml [utf8] Wed Jan 14 11:01:17 2009
@@ -74,7 +74,7 @@
 \n
 # XXX Hardcoded format\n
 report_data = context.report_view.pt_render(\n
-      extra_context=dict(options={\'format\': \'pdf\'},\n
+      extra_context=dict(options={\'format\': format},\n
                          rendered_report_item_list=[r[1] for r in report_section_list],\n
                          report_method=dummyReportMethod,\n
                          form=portal.restrictedTraverse(form_path)))\n
@@ -106,7 +106,7 @@
         </item>
         <item>
             <key> <string>_params</string> </key>
-            <value> <string>active_process_url, skin_name, localizer_language, title, request_other, form_path, user_name</string> </value>
+            <value> <string>active_process_url, skin_name, localizer_language, title, request_other, form_path, user_name, format</string> </value>
         </item>
         <item>
             <key> <string>_proxy_roles</string> </key>
@@ -134,7 +134,7 @@
                   <dictionary>
                     <item>
                         <key> <string>co_argcount</string> </key>
-                        <value> <int>7</int> </value>
+                        <value> <int>8</int> </value>
                     </item>
                     <item>
                         <key> <string>co_varnames</string> </key>
@@ -147,6 +147,7 @@
                             <string>request_other</string>
                             <string>form_path</string>
                             <string>user_name</string>
+                            <string>format</string>
                             <string>_getattr_</string>
                             <string>container</string>
                             <string>request</string>

Modified: erp5/trunk/bt5/erp5_deferred_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/bt/revision?rev=25097&r1=25096&r2=25097&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_deferred_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_deferred_style/bt/revision [utf8] Wed Jan 14 11:01:17 2009
@@ -1,1 +1,1 @@
-36
+43