[Erp5-report] r23532 - in /erp5/trunk/bt5/erp5_calendar: SkinTemplateItem/portal_skins/erp5...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Sep 9 18:52:48 CEST 2008
Author: jerome
Date: Tue Sep 9 18:52:46 2008
New Revision: 23532
URL: http://svn.erp5.org?rev=23532&view=rev
Log:
This report uses resource titles as columns, so it should use the new "untranslatable columns" feature of listbox.
Added:
erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxUntranslatableColumnList.xml
Modified:
erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxColumnList.xml
erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_viewLeaveRequestReportSection/listbox.xml
erp5/trunk/bt5/erp5_calendar/bt/revision
Modified: erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxColumnList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxColumnList.xml?rev=23532&r1=23531&r2=23532&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxColumnList.xml (original)
+++ erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxColumnList.xml Tue Sep 9 18:52:46 2008
@@ -65,34 +65,16 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>from Products.PythonScripts.standard import Object\n
-request = container.REQUEST\n
-portal = context.getPortalObject()\n
-stool = portal.portal_simulation\n
+ <value> <string>column_item_list = [ (\'person_career_reference\', \'Employee Number\'),\n
+ (\'person_title\', \'Name\'), ]\n
\n
-from_date = request[\'from_date\']\n
-to_date = request[\'to_date\']\n
+non_translatable_column_item_list = context\\\n
+ .PersonModule_getLeaveRequestReportListboxUntranslatableColumnList()\n
+non_translatable_column_item_list.sort(lambda a,b: cmp(a[1], b[1]))\n
\n
-result_list = [ (\'person_career_reference\', \'Employee Number\'),\n
- (\'person_title\', \'Name\'), ]\n
-\n
-# get all resources used for leave requests\n
-resource_list = []\n
-for inventory in stool.getInventoryList(\n
- from_date=from_date,\n
- to_date=to_date,\n
- portal_type=\'Leave Request Period\',\n
- group_by_resource=1):\n
- resource_list.append(\n
- (inventory.resource_relative_url,\n
- portal.portal_categories.restrictedTraverse(\n
- inventory.resource_relative_url).getTitle()))\n
-\n
-resource_list.sort(lambda a,b: cmp(a[1], b[1]))\n
-result_list.extend(resource_list)\n
-\n
-result_list.append((\'total\', \'Total\'))\n
-return result_list\n
+column_item_list.extend(non_translatable_column_item_list)\n
+column_item_list.append((\'total\', \'Total\'))\n
+return column_item_list\n
</string> </value>
</item>
<item>
@@ -136,21 +118,10 @@
<value>
<tuple>
<string>kw</string>
- <string>Products.PythonScripts.standard</string>
- <string>Object</string>
+ <string>column_item_list</string>
<string>_getattr_</string>
- <string>container</string>
- <string>request</string>
<string>context</string>
- <string>portal</string>
- <string>stool</string>
- <string>_getitem_</string>
- <string>from_date</string>
- <string>to_date</string>
- <string>result_list</string>
- <string>resource_list</string>
- <string>_getiter_</string>
- <string>inventory</string>
+ <string>non_translatable_column_item_list</string>
</tuple>
</value>
</item>
Added: erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxUntranslatableColumnList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxUntranslatableColumnList.xml?rev=23532&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxUntranslatableColumnList.xml (added)
+++ erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_getLeaveRequestReportListboxUntranslatableColumnList.xml Tue Sep 9 18:52:46 2008
@@ -1,0 +1,176 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>Python_magic</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>Script_magic</string> </key>
+ <value> <int>3</int> </value>
+ </item>
+ <item>
+ <key> <string>__ac_local_roles__</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_bind_names</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>_asgns</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>name_container</string> </key>
+ <value> <string>container</string> </value>
+ </item>
+ <item>
+ <key> <string>name_context</string> </key>
+ <value> <string>context</string> </value>
+ </item>
+ <item>
+ <key> <string>name_m_self</string> </key>
+ <value> <string>script</string> </value>
+ </item>
+ <item>
+ <key> <string>name_subpath</string> </key>
+ <value> <string>traverse_subpath</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>_body</string> </key>
+ <value> <string>from Products.PythonScripts.standard import Object\n
+request = container.REQUEST\n
+portal = context.getPortalObject()\n
+stool = portal.portal_simulation\n
+\n
+from_date = request[\'from_date\']\n
+to_date = request[\'to_date\']\n
+\n
+result_list = [ ]\n
+\n
+# get all resources used for leave requests\n
+resource_list = []\n
+for inventory in stool.getInventoryList(\n
+ from_date=from_date,\n
+ to_date=to_date,\n
+ portal_type=\'Leave Request Period\',\n
+ group_by_resource=1):\n
+ resource_list.append(\n
+ (inventory.resource_relative_url,\n
+ portal.portal_categories.restrictedTraverse(\n
+ inventory.resource_relative_url).getTitle()))\n
+\n
+return result_list\n
+</string> </value>
+ </item>
+ <item>
+ <key> <string>_code</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_filepath</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>_params</string> </key>
+ <value> <string>**kw</string> </value>
+ </item>
+ <item>
+ <key> <string>errors</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_code</string> </key>
+ <value>
+ <object>
+ <klass>
+ <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+ </klass>
+ <tuple/>
+ <state>
+ <dictionary>
+ <item>
+ <key> <string>co_argcount</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>co_varnames</string> </key>
+ <value>
+ <tuple>
+ <string>kw</string>
+ <string>Products.PythonScripts.standard</string>
+ <string>Object</string>
+ <string>_getattr_</string>
+ <string>container</string>
+ <string>request</string>
+ <string>context</string>
+ <string>portal</string>
+ <string>stool</string>
+ <string>_getitem_</string>
+ <string>from_date</string>
+ <string>to_date</string>
+ <string>result_list</string>
+ <string>resource_list</string>
+ <string>_getiter_</string>
+ <string>inventory</string>
+ </tuple>
+ </value>
+ </item>
+ </dictionary>
+ </state>
+ </object>
+ </value>
+ </item>
+ <item>
+ <key> <string>func_defaults</string> </key>
+ <value>
+ <none/>
+ </value>
+ </item>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>PersonModule_getLeaveRequestReportListboxUntranslatableColumnList</string> </value>
+ </item>
+ <item>
+ <key> <string>warnings</string> </key>
+ <value>
+ <tuple/>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_viewLeaveRequestReportSection/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_viewLeaveRequestReportSection/listbox.xml?rev=23532&r1=23531&r2=23532&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_viewLeaveRequestReportSection/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_calendar/SkinTemplateItem/portal_skins/erp5_calendar/PersonModule_viewLeaveRequestReportSection/listbox.xml Tue Sep 9 18:52:46 2008
@@ -18,6 +18,7 @@
<string>list_method</string>
<string>stat_method</string>
<string>selection_name</string>
+ <string>untranslatable_columns</string>
</list>
</value>
</item>
@@ -60,50 +61,60 @@
<value>
<dictionary>
<item>
+ <key> <string>columns</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>field_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>form_id</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>list_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>selection_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>stat_method</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>target</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>untranslatable_columns</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>all_editable_columns</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
+ <item>
<key> <string>columns</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>field_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>form_id</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>list_method</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>selection_name</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>target</string> </key>
- <value> <string></string> </value>
- </item>
- <item>
- <key> <string>title</string> </key>
- <value> <string></string> </value>
- </item>
- </dictionary>
- </value>
- </item>
- <item>
- <key> <string>values</string> </key>
- <value>
- <dictionary>
- <item>
- <key> <string>all_editable_columns</string> </key>
- <value>
- <list/>
- </value>
- </item>
- <item>
- <key> <string>columns</string> </key>
<value>
<list>
<tuple>
@@ -122,19 +133,19 @@
<value> <string>Base_viewFieldLibrary</string> </value>
</item>
<item>
- <key> <string>list_method</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
- </value>
- </item>
- <item>
- <key> <string>selection_name</string> </key>
+ <key> <string>list_method</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>selection_name</string> </key>
<value> <string>leave_request_report_selection</string> </value>
</item>
<item>
- <key> <string>stat_method</string> </key>
- <value>
- <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ <key> <string>stat_method</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
<item>
@@ -142,8 +153,14 @@
<value> <string>Click to edit the target</string> </value>
</item>
<item>
- <key> <string>title</string> </key>
+ <key> <string>title</string> </key>
<value> <string>Leave Requests Report</string> </value>
+ </item>
+ <item>
+ <key> <string>untranslatable_columns</string> </key>
+ <value>
+ <list/>
+ </value>
</item>
</dictionary>
</value>
@@ -170,6 +187,22 @@
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ <tuple/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>here/PersonModule_getLeaveRequestReportListboxUntranslatableColumnList</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="4" aka="AAAAAAAAAAQ=">
+ <pickle>
+ <tuple>
<global name="Method" module="Products.Formulator.MethodField"/>
<tuple/>
</tuple>
@@ -183,7 +216,7 @@
</dictionary>
</pickle>
</record>
- <record id="4" aka="AAAAAAAAAAQ=">
+ <record id="5" aka="AAAAAAAAAAU=">
<pickle>
<tuple>
<global name="Method" module="Products.Formulator.MethodField"/>
Modified: erp5/trunk/bt5/erp5_calendar/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_calendar/bt/revision?rev=23532&r1=23531&r2=23532&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_calendar/bt/revision (original)
+++ erp5/trunk/bt5/erp5_calendar/bt/revision Tue Sep 9 18:52:46 2008
@@ -1,1 +1,1 @@
-349
+350
More information about the Erp5-report
mailing list