[Erp5-report] r26201 - in /erp5/trunk/bt5/erp5_deferred_style: SkinTemplateItem/portal_skin...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Mar 31 12:06:33 CEST 2009
Author: jerome
Date: Tue Mar 31 12:06:27 2009
New Revision: 26201
URL: http://svn.erp5.org?rev=26201&view=rev
Log:
- don't force format to pdf, if it's empty, it means no conversion
- try to keep the report context, unless it's the portal which is not an active object
Modified:
erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_activateReport.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=26201&r1=26200&r2=26201&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] Tue Mar 31 12:06:27 2009
@@ -56,7 +56,7 @@
<value> <string>request = container.REQUEST\n
RESPONSE = request.RESPONSE\n
\n
-format = request.get(\'format\', \'pdf\') or \'pdf\'\n
+format = request.get(\'format\', \'\')\n
skin_name = request.get(\'deferred_portal_skin\', \'ODT\') or \'ODT\'\n
\n
portal = context.getPortalObject()\n
@@ -112,7 +112,12 @@
report_section_idx=idx,\n
request_other=request_other)\n
\n
-portal.portal_simulation.activate(activity=\'SQLQueue\', after_tag=tag, priority=priority).Base_report(\n
+activity_context = context\n
+if activity_context == portal:\n
+ # portal is not an active object\n
+ activity_context = portal.portal_simulation\n
+\n
+activity_context.activate(activity=\'SQLQueue\', after_tag=tag, priority=priority).Base_report(\n
active_process_url=active_process.getRelativeUrl(),\n
skin_name=skin_name,\n
localizer_language=localizer_language,\n
@@ -203,6 +208,7 @@
<string>idx</string>
<string>report_section</string>
<string>doc</string>
+ <string>activity_context</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_deferred_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/bt/revision?rev=26201&r1=26200&r2=26201&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_deferred_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_deferred_style/bt/revision [utf8] Tue Mar 31 12:06:27 2009
@@ -1,1 +1,1 @@
-49
+50
More information about the Erp5-report
mailing list