[Erp5-report] r31365 romain - in /erp5/trunk/bt5/erp5_project: SkinTemplateItem/portal_skin...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Dec 17 09:56:37 CET 2009
Author: romain
Date: Thu Dec 17 09:56:35 2009
New Revision: 31365
URL: http://svn.erp5.org?rev=31365&view=rev
Log:
Project_viewTaskList and Project_viewTaskReportList listbox's columns are not sortable (because the list method do not handle it currently).
Sort result of Project_getSourceProjectRelatedTaskList to make it consistent with Project_getSourceProjectRelatedTaskReportList.
Modified:
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml
erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml
erp5/trunk/bt5/erp5_project/bt/revision
Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml?rev=31365&r1=31364&r2=31365&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml [utf8] Thu Dec 17 09:56:35 2009
@@ -81,6 +81,14 @@
for task in task_list:\n
task_line_list.extend(task.contentValues(portal_type=\'Task Line\'))\n
\n
+def sortTaskLine(a, b):\n
+ result = cmp(a.getStartDate(), b.getStartDate())\n
+ if result == 0:\n
+ result = cmp(a.getTitle(), b.getTitle())\n
+ return result\n
+\n
+task_line_list.sort(sortTaskLine)\n
+\n
return task_line_list\n
@@ -142,6 +150,7 @@
<string>task_list</string>
<string>task_line_list</string>
<string>task</string>
+ <string>sortTaskLine</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml?rev=31365&r1=31364&r2=31365&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml [utf8] Thu Dec 17 09:56:35 2009
@@ -13,16 +13,17 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>all_columns</string>
+ <string>columns</string>
+ <string>editable_columns</string>
+ <string>list_method</string>
+ <string>portal_types</string>
+ <string>report_root_list</string>
+ <string>report_tree</string>
+ <string>selection_name</string>
+ <string>sort_columns</string>
+ <string>stat_method</string>
<string>title</string>
- <string>columns</string>
- <string>all_columns</string>
- <string>list_method</string>
- <string>stat_method</string>
- <string>selection_name</string>
- <string>portal_types</string>
- <string>editable_columns</string>
- <string>report_tree</string>
- <string>report_root_list</string>
</list>
</value>
</item>
@@ -237,6 +238,17 @@
<item>
<key> <string>separate_tree_data</string> </key>
<value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>sort_columns</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>id</string>
+ <string>ID</string>
+ </tuple>
+ </list>
+ </value>
</item>
<item>
<key> <string>stat_method</string> </key>
Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml?rev=31365&r1=31364&r2=31365&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml [utf8] Thu Dec 17 09:56:35 2009
@@ -13,16 +13,17 @@
<key> <string>delegated_list</string> </key>
<value>
<list>
+ <string>all_columns</string>
+ <string>columns</string>
+ <string>editable_columns</string>
+ <string>list_method</string>
+ <string>portal_types</string>
+ <string>report_root_list</string>
+ <string>report_tree</string>
+ <string>selection_name</string>
+ <string>sort_columns</string>
+ <string>stat_method</string>
<string>title</string>
- <string>columns</string>
- <string>all_columns</string>
- <string>list_method</string>
- <string>stat_method</string>
- <string>selection_name</string>
- <string>portal_types</string>
- <string>editable_columns</string>
- <string>report_tree</string>
- <string>report_root_list</string>
</list>
</value>
</item>
@@ -229,6 +230,17 @@
<item>
<key> <string>separate_tree_data</string> </key>
<value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>sort_columns</string> </key>
+ <value>
+ <list>
+ <tuple>
+ <string>id</string>
+ <string>ID</string>
+ </tuple>
+ </list>
+ </value>
</item>
<item>
<key> <string>stat_method</string> </key>
Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=31365&r1=31364&r2=31365&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision [utf8] Thu Dec 17 09:56:35 2009
@@ -1,1 +1,1 @@
-717
+721
More information about the Erp5-report
mailing list