From 9046b4fdd51fa11539a00ff03f704a24460f6404 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Tue, 30 Oct 2007 14:09:45 +0000
Subject: [PATCH] Use proxy fields to show all possible formats for selected
report style in preferences for current logged in user.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17295 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
...older_viewContentListAsODSReportDialog.xml | 6 +-
.../portal_skin.xml | 23 +-
.../your_format.xml | 202 +++---------------
bt5/erp5_ods_style/bt/revision | 2 +-
4 files changed, 58 insertions(+), 175 deletions(-)
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog.xml
index 8cfdbfc1a0..1b5a963b42 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog.xml
@@ -49,6 +49,10 @@
<key> <string>action</string> </key>
<value> <string>Folder_viewContentListAsODSReport</string> </value>
</item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
@@ -137,7 +141,7 @@
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Export Content as SpreadSheet</string> </value>
+ <value> <string>Export Content</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/portal_skin.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/portal_skin.xml
index a7e41e74ec..7dac095569 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/portal_skin.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/portal_skin.xml
@@ -124,7 +124,9 @@
</item>
<item>
<key> <string>default</string> </key>
- <value> <string></string> </value>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
</item>
<item>
<key> <string>description</string> </key>
@@ -263,4 +265,23 @@
</dictionary>
</pickle>
</record>
+ <record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.Formulator.TALESField</string>
+ <string>TALESMethod</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>here/portal_preferences/getPreferredReportStyle</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
</ZopeData>
diff --git a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_format.xml b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_format.xml
index a9f851735a..aaf310aced 100644
--- a/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_format.xml
+++ b/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_viewContentListAsODSReportDialog/your_format.xml
@@ -4,14 +4,24 @@
<pickle>
<tuple>
<tuple>
- <string>Products.Formulator.StandardFields</string>
- <string>ListField</string>
+ <string>Products.ERP5Form.ProxyField</string>
+ <string>ProxyField</string>
</tuple>
<none/>
</tuple>
</pickle>
<pickle>
<dictionary>
+ <item>
+ <key> <string>delegated_list</string> </key>
+ <value>
+ <list>
+ <string>title</string>
+ <string>description</string>
+ <string>items</string>
+ </list>
+ </value>
+ </item>
<item>
<key> <string>id</string> </key>
<value> <string>your_format</string> </value>
@@ -24,14 +34,6 @@
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
- <item>
- <key> <string>required_not_found</string> </key>
- <value> <string>Input is required but no input given.</string> </value>
- </item>
- <item>
- <key> <string>unknown_selection</string> </key>
- <value> <string>You selected an item that was not in the list.</string> </value>
- </item>
</dictionary>
</value>
</item>
@@ -40,71 +42,15 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>extra_item</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>first_item</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>items</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>size</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -115,73 +61,29 @@
<value>
<dictionary>
<item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
+ <key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>description</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>editable</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>enabled</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra_item</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>first_item</string> </key>
+ <key> <string>field_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>hidden</string> </key>
+ <key> <string>form_id</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>items</string> </key>
+ <key> <string>items</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
- <key> <string>required</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>size</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
+ <key> <string>target</string> </key>
<value> <string></string> </value>
</item>
<item>
- <key> <string>whitespace_preserve</string> </key>
+ <key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
@@ -191,49 +93,17 @@
<key> <string>values</string> </key>
<value>
<dictionary>
- <item>
- <key> <string>alternate_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>css_class</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>default</string> </key>
- <value> <string></string> </value>
- </item>
<item>
<key> <string>description</string> </key>
- <value> <string></string> </value>
+ <value> <string>Conversion Format for reports.</string> </value>
</item>
<item>
- <key> <string>editable</string> </key>
- <value> <int>1</int> </value>
+ <key> <string>field_id</string> </key>
+ <value> <string>my_category</string> </value>
</item>
<item>
- <key> <string>enabled</string> </key>
- <value> <int>1</int> </value>
- </item>
- <item>
- <key> <string>external_validator</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>extra_item</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>first_item</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>hidden</string> </key>
- <value> <int>0</int> </value>
+ <key> <string>form_id</string> </key>
+ <value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
<key> <string>items</string> </key>
@@ -242,24 +112,12 @@
</value>
</item>
<item>
- <key> <string>required</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>size</string> </key>
- <value> <int>1</int> </value>
+ <key> <string>target</string> </key>
+ <value> <string>Click to edit the target</string> </value>
</item>
<item>
<key> <string>title</string> </key>
- <value> <string>Export Format</string> </value>
- </item>
- <item>
- <key> <string>unicode</string> </key>
- <value> <int>0</int> </value>
- </item>
- <item>
- <key> <string>whitespace_preserve</string> </key>
- <value> <int>0</int> </value>
+ <value> <string>Report Format</string> </value>
</item>
</dictionary>
</value>
@@ -281,7 +139,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python: here.Base_getConversionFormatItemList(base_content_type=\'application/vnd.oasis.opendocument.spreadsheet\')</string> </value>
+ <value> <string>python: context.portal_preferences.Preference_getReportFormatItemList()</string> </value>
</item>
</dictionary>
</pickle>
diff --git a/bt5/erp5_ods_style/bt/revision b/bt5/erp5_ods_style/bt/revision
index 9f72858795..69226f7293 100644
--- a/bt5/erp5_ods_style/bt/revision
+++ b/bt5/erp5_ods_style/bt/revision
@@ -1 +1 @@
-88
\ No newline at end of file
+92
\ No newline at end of file
--
2.30.9