From 1151cb883d074ea30ba30181be50b9ad0cda3205 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Fri, 14 Mar 2008 13:20:40 +0000 Subject: [PATCH] Improve listbox configuration git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@19896 20353a03-c40f-0410-a6d1-a30d3c3de9de --- ...roject_getSourceProjectRelatedTaskList.xml | 2 +- .../Project_viewTaskList/listbox.xml | 49 ++++++----------- .../Project_viewTaskReportList/listbox.xml | 52 ++++++------------- bt5/erp5_project/bt/revision | 2 +- 4 files changed, 33 insertions(+), 72 deletions(-) diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml index e379c5203a..a2939ebb58 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml @@ -74,7 +74,7 @@ task_list = [x.getObject() for x in \\\n source_project_uid = source_project_uid_list)]\n task_line_list = []\n for task in task_list:\n - task_line_list.extend(task.objectValues(portal_type=\'Task Line\'))\n + task_line_list.extend(task.contentValues(portal_type=\'Task Line\'))\n \n return task_line_list\n </string> </value> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml index 61c1cef710..d7404ad3f6 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml @@ -14,10 +14,8 @@ <value> <list> <string>title</string> - <string>lines</string> <string>columns</string> <string>all_columns</string> - <string>sort</string> <string>list_method</string> <string>stat_method</string> <string>selection_name</string> @@ -91,7 +89,7 @@ <value> <int>1</int> </value> </item> <item> - <key> <string>all_columns</string> </key> + <key> <string>all_columns</string> </key> <value> <list> <tuple> @@ -131,11 +129,11 @@ <string>Estimated Time</string> </tuple> <tuple> - <string>quantity_unit</string> + <string>quantity_unit_title</string> <string>Unit</string> </tuple> <tuple> - <string>simulation_state</string> + <string>getTranslatedSimulationStateTitle</string> <string>State</string> </tuple> </list> @@ -165,7 +163,7 @@ </value> </item> <item> - <key> <string>columns</string> </key> + <key> <string>columns</string> </key> <value> <list> <tuple> @@ -205,18 +203,18 @@ <string>Estimated Time</string> </tuple> <tuple> - <string>quantity_unit</string> + <string>quantity_unit_title</string> <string>Unit</string> </tuple> <tuple> - <string>simulation_state</string> + <string>getTranslatedSimulationStateTitle</string> <string>State</string> </tuple> </list> </value> </item> <item> - <key> <string>editable_columns</string> </key> + <key> <string>editable_columns</string> </key> <value> <list> <tuple> @@ -247,21 +245,17 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>lines</string> </key> - <value> <int>10</int> </value> - </item> - <item> - <key> <string>list_action</string> </key> + <key> <string>list_action</string> </key> <value> <string>Project_viewLineList</string> </value> </item> <item> - <key> <string>list_method</string> </key> + <key> <string>list_method</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> - <key> <string>portal_types</string> </key> + <key> <string>portal_types</string> </key> <value> <list> <tuple> @@ -272,7 +266,7 @@ </value> </item> <item> - <key> <string>report_root_list</string> </key> + <key> <string>report_root_list</string> </key> <value> <list> <tuple> @@ -283,11 +277,11 @@ </value> </item> <item> - <key> <string>report_tree</string> </key> + <key> <string>report_tree</string> </key> <value> <int>1</int> </value> </item> <item> - <key> <string>selection_name</string> </key> + <key> <string>selection_name</string> </key> <value> <string>project_task_selection</string> </value> </item> <item> @@ -295,18 +289,7 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>sort</string> </key> - <value> - <list> - <tuple> - <string>id</string> - <string>id</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>stat_method</string> </key> + <key> <string>stat_method</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> @@ -316,8 +299,8 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> - <value> <string>Listbox</string> </value> + <key> <string>title</string> </key> + <value> <string>Tasks</string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml index 0aa6771ff5..0740e3e257 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskReportList/listbox.xml @@ -14,10 +14,8 @@ <value> <list> <string>title</string> - <string>lines</string> <string>columns</string> <string>all_columns</string> - <string>sort</string> <string>list_method</string> <string>stat_method</string> <string>selection_name</string> @@ -25,7 +23,6 @@ <string>editable_columns</string> <string>report_tree</string> <string>report_root_list</string> - <string>list_action</string> </list> </value> </item> @@ -91,7 +88,7 @@ <value> <int>1</int> </value> </item> <item> - <key> <string>all_columns</string> </key> + <key> <string>all_columns</string> </key> <value> <list> <tuple> @@ -131,11 +128,11 @@ <string>Estimated Time</string> </tuple> <tuple> - <string>quantity_unit</string> + <string>quantity_unit_title</string> <string>Unit</string> </tuple> <tuple> - <string>simulation_state</string> + <string>getTranslatedSimulationStateTitle</string> <string>State</string> </tuple> </list> @@ -165,7 +162,7 @@ </value> </item> <item> - <key> <string>columns</string> </key> + <key> <string>columns</string> </key> <value> <list> <tuple> @@ -205,18 +202,18 @@ <string>Estimated Time</string> </tuple> <tuple> - <string>quantity_unit</string> + <string>quantity_unit_title</string> <string>Unit</string> </tuple> <tuple> - <string>simulation_state</string> + <string>getTranslatedSimulationStateTitle</string> <string>State</string> </tuple> </list> </value> </item> <item> - <key> <string>editable_columns</string> </key> + <key> <string>editable_columns</string> </key> <value> <list> <tuple> @@ -239,21 +236,13 @@ <value> <string>Base_viewFieldLibrary</string> </value> </item> <item> - <key> <string>lines</string> </key> - <value> <int>10</int> </value> - </item> - <item> - <key> <string>list_action</string> </key> - <value> <string>Project_viewLineList</string> </value> - </item> - <item> - <key> <string>list_method</string> </key> + <key> <string>list_method</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> </value> </item> <item> - <key> <string>portal_types</string> </key> + <key> <string>portal_types</string> </key> <value> <list> <tuple> @@ -264,7 +253,7 @@ </value> </item> <item> - <key> <string>report_root_list</string> </key> + <key> <string>report_root_list</string> </key> <value> <list> <tuple> @@ -275,11 +264,11 @@ </value> </item> <item> - <key> <string>report_tree</string> </key> + <key> <string>report_tree</string> </key> <value> <int>1</int> </value> </item> <item> - <key> <string>selection_name</string> </key> + <key> <string>selection_name</string> </key> <value> <string>project_task_report_selection</string> </value> </item> <item> @@ -287,18 +276,7 @@ <value> <int>0</int> </value> </item> <item> - <key> <string>sort</string> </key> - <value> - <list> - <tuple> - <string>id</string> - <string>id</string> - </tuple> - </list> - </value> - </item> - <item> - <key> <string>stat_method</string> </key> + <key> <string>stat_method</string> </key> <value> <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent> </value> @@ -308,8 +286,8 @@ <value> <string>Click to edit the target</string> </value> </item> <item> - <key> <string>title</string> </key> - <value> <string>Listbox</string> </value> + <key> <string>title</string> </key> + <value> <string>Task Reports</string> </value> </item> </dictionary> </value> diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index 3cf63f91e6..82a1667ba9 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -425 \ No newline at end of file +426 \ No newline at end of file -- 2.30.9