[Erp5-report] r29175 - in /erp5/trunk/bt5/erp5_deferred_style: RegisteredSkinSelectionTempl...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Sep 24 18:51:07 CEST 2009
Author: nicolas
Date: Thu Sep 24 18:51:01 2009
New Revision: 29175
URL: http://svn.erp5.org?rev=29175&view=rev
Log:
Authorised report rendering with ERP5Form for deferred_style
Added:
erp5/trunk/bt5/erp5_deferred_style/RegisteredSkinSelectionTemplateItem/
erp5/trunk/bt5/erp5_deferred_style/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml
erp5/trunk/bt5/erp5_deferred_style/bt/template_local_role_list
erp5/trunk/bt5/erp5_deferred_style/bt/template_portal_type_role_list
erp5/trunk/bt5/erp5_deferred_style/bt/template_registered_skin_selection_list
Modified:
erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style.xml
erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/report_view.xml
erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_activateReport.xml
erp5/trunk/bt5/erp5_deferred_style/bt/revision
Added: erp5/trunk/bt5/erp5_deferred_style/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml?rev=29175&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_deferred_style/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml (added)
+++ erp5/trunk/bt5/erp5_deferred_style/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml [utf8] Thu Sep 24 18:51:01 2009
@@ -1,0 +1,6 @@
+<registered_skin_selection>
+ <skin_folder_selection>
+ <skin_folder>erp5_deferred_style</skin_folder>
+ <skin_selection>Deferred</skin_selection>
+ </skin_folder_selection>
+</registered_skin_selection>
Modified: erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style.xml?rev=29175&r1=29174&r2=29175&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style.xml [utf8] Thu Sep 24 18:51:01 2009
@@ -12,32 +12,13 @@
<item>
<key> <string>_local_properties</string> </key>
<value>
- <tuple>
- <dictionary>
- <item>
- <key> <string>id</string> </key>
- <value> <string>business_template_registered_skin_selections</string> </value>
- </item>
- <item>
- <key> <string>type</string> </key>
- <value> <string>tokens</string> </value>
- </item>
- </dictionary>
- </tuple>
+ <tuple/>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
- </value>
- </item>
- <item>
- <key> <string>business_template_registered_skin_selections</string> </key>
- <value>
- <tuple>
- <string>Deferred</string>
- </tuple>
</value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/report_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/report_view.xml?rev=29175&r1=29174&r2=29175&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/report_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style/report_view.xml [utf8] Thu Sep 24 18:51:01 2009
@@ -39,7 +39,7 @@
<key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[
-<tal:block tal:attributes="dummy python:here.Base_activateReport(report_method=report_method, form=form)"/>
+<tal:block tal:attributes="dummy python:here.Base_activateReport(form=form)"/>
]]></string> </value>
</item>
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=29175&r1=29174&r2=29175&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] Thu Sep 24 18:51:01 2009
@@ -80,7 +80,15 @@
priority = 3\n
\n
# compute list of report section to render\n
-report_section_list = report_method()\n
+if form.meta_type == \'ERP5 Report\':\n
+ report_section_list = getattr(context, form.report_method)()\n
+elif form.meta_type == \'ERP5 Form\':\n
+ report_section_list = []\n
+ for field in form.get_fields():\n
+ if field.getRecursiveTemplateField().meta_type == \'ReportBox\':\n
+ report_section_list.extend(field.render())\n
+else:\n
+ raise ValueError, \'form meta_type unknown\'\n
\n
# save request parameters (after calling the report_method which may tweak the\n
# request). XXX we exclude some reserved names in a very ad hoc way\n
@@ -143,7 +151,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>report_method, form, **kw</string> </value>
+ <value> <string>form, **kw</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
@@ -171,13 +179,12 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>2</int> </value>
+ <value> <int>1</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
- <string>report_method</string>
<string>form</string>
<string>kw</string>
<string>_getattr_</string>
@@ -197,9 +204,12 @@
<string>random</string>
<string>tag</string>
<string>priority</string>
+ <string>getattr</string>
<string>report_section_list</string>
+ <string>_getiter_</string>
+ <string>field</string>
+ <string>ValueError</string>
<string>request_other</string>
- <string>_getiter_</string>
<string>k</string>
<string>v</string>
<string>_write_</string>
Modified: erp5/trunk/bt5/erp5_deferred_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/bt/revision?rev=29175&r1=29174&r2=29175&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_deferred_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_deferred_style/bt/revision [utf8] Thu Sep 24 18:51:01 2009
@@ -1,1 +1,1 @@
-55
+59
Added: erp5/trunk/bt5/erp5_deferred_style/bt/template_local_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/bt/template_local_role_list?rev=29175&view=auto
==============================================================================
(empty)
Added: erp5/trunk/bt5/erp5_deferred_style/bt/template_portal_type_role_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/bt/template_portal_type_role_list?rev=29175&view=auto
==============================================================================
(empty)
Added: erp5/trunk/bt5/erp5_deferred_style/bt/template_registered_skin_selection_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_deferred_style/bt/template_registered_skin_selection_list?rev=29175&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_deferred_style/bt/template_registered_skin_selection_list (added)
+++ erp5/trunk/bt5/erp5_deferred_style/bt/template_registered_skin_selection_list [utf8] Thu Sep 24 18:51:01 2009
@@ -1,0 +1,1 @@
+erp5_deferred_style | Deferred
More information about the Erp5-report
mailing list