[Erp5-report] r18159 - in /erp5/trunk/bt5/erp5_ods_style: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Dec 10 11:26:27 2007
New Revision: 18159

URL: http://svn.erp5.org?rev=18159&view=rev
Log:
Folder_getContentListAsODSReportSectionList: honor checked uid; don't translate object title.

Added:
    erp5/trunk/bt5/erp5_ods_style/bt/template_catalog_datetime_key_list
Modified:
    erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml
    erp5/trunk/bt5/erp5_ods_style/bt/revision

Modified: erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml?rev=18159&r1=18158&r2=18159&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml (original)
+++ erp5/trunk/bt5/erp5_ods_style/SkinTemplateItem/portal_skins/erp5_ods_core/Folder_getContentListAsODSReportSectionList.xml Mon Dec 10 11:26:27 2007
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -83,24 +80,29 @@
   report_section_list = []\n
   doc = doc.getObject()\n
   title = doc.getTitle()\n
-  title = translate(title)\n
-  report_section_list.append(ReportSection(level = 1, \n
-                                           title = title, \n
+  report_section_list.append(ReportSection(level = 1,\n
+                                           title = title,\n
                                            form_id = None))\n
   for action in portal.portal_actions.listFilteredActionsFor(doc)[\'object_view\']:\n
     form_id = action[\'url\'].split(\'/\')[-1].split(\'?\')[0]\n
-    action_title = action[\'title\']    \n
+    action_title = action[\'title\']\n
     if action_title != \'History\' and action_title != \'Metadata\':\n
-      report_section_list.append(ReportSection(path = doc.getPath(), \n
-                                               form_id = form_id, \n
-                                               level = 2, \n
+      report_section_list.append(ReportSection(path = doc.getPath(),\n
+                                               form_id = form_id,\n
+                                               level = 2,\n
                                                title = \'%s - %s\' % (title, translate(action_title))))\n
   return report_section_list\n
 \n
 if selection_name is not None:\n
-  # get all documents in the selection\n
-  for doc in portal.portal_selections.callSelectionFor(selection_name, context=form):\n
-    report_section_list.extend(getReportSectionListForObject(doc))\n
+  checked_uid_list = portal.portal_selections.getSelectionCheckedUidsFor(selection_name)\n
+  if checked_uid_list:\n
+    getObject = portal.portal_catalog.getObject\n
+    for uid in checked_uid_list:\n
+      report_section_list.extend(getReportSectionListForObject(getObject(doc)))\n
+  else:\n
+    # get all documents in the selection\n
+    for doc in portal.portal_selections.callSelectionFor(selection_name, context=form):\n
+      report_section_list.extend(getReportSectionListForObject(doc))\n
 else:\n
   # get only current (context) document \n
   report_section_list.extend(getReportSectionListForObject(context))\n
@@ -162,7 +164,10 @@
                             <string>selection_name</string>
                             <string>translate</string>
                             <string>getReportSectionListForObject</string>
+                            <string>checked_uid_list</string>
+                            <string>getObject</string>
                             <string>_getiter_</string>
+                            <string>uid</string>
                             <string>doc</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_ods_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/revision?rev=18159&r1=18158&r2=18159&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ods_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_ods_style/bt/revision Mon Dec 10 11:26:27 2007
@@ -1,1 +1,1 @@
-92
+93

Added: erp5/trunk/bt5/erp5_ods_style/bt/template_catalog_datetime_key_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ods_style/bt/template_catalog_datetime_key_list?rev=18159&view=auto
==============================================================================
    (empty)