diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateProjectDomain.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateProjectDomain.xml index 600e2f619dda5b953b47b0240f540a7d8b8222e7..af87e3243ee0fa2d5c31ee02719978df955f3215 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateProjectDomain.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateProjectDomain.xml @@ -66,6 +66,9 @@ <item> <key> <string>_body</string> </key> <value> <string>request = context.REQUEST\n +\n +project_line_portal_type = \'Project Line\'\n +\n domain_list = []\n \n #context.log(\'depth\', depth)\n @@ -75,14 +78,16 @@ here = context.REQUEST[\'here\']\n \n #context.log(\'parent.getMembershipCriterionCategoryList\', parent.getMembershipCriterionCategoryList())\n \n +\n +\n if depth == 0:\n - category_list = here.objectValues(portal_type=\'Project Line\')\n + category_list = here.contentValues(portal_type=project_line_portal_type)\n #for i in context.portal_selections.getSelectionValueList(context=context,\n # selection_name= \'task_selection\'):\n # category_list.extend([j for j in i.getSourceProjectValueList(portal_type="Project") if j not in category_list])\n \n else:\n - category_list = [ ]\n + category_list = []\n #category_list = parent.objectValues()\n #for i in context.portal_selections.getSelectionValueList(context=context,\n # selection_name=\'project_task_selection\'):\n @@ -92,7 +97,7 @@ else:\n parent_category_list = parent.getMembershipCriterionCategoryList()\n for parent_category in parent_category_list:\n parent_category = \'/\'.join(parent_category.split(\'/\')[1:])\n - category_list.extend(context.restrictedTraverse(parent_category).objectValues())\n + category_list.extend(context.restrictedTraverse(parent_category).contentValues(portal_type=project_line_portal_type))\n \n i = 0\n for category in category_list:\n @@ -156,6 +161,7 @@ return domain_list\n <string>_getattr_</string> <string>context</string> <string>request</string> + <string>project_line_portal_type</string> <string>domain_list</string> <string>_getitem_</string> <string>here</string> 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 d7404ad3f6ebbafdbbbfdb57288990bfa614c8f1..dc743128fe01de7cadd1f86fdf8903e698b83552 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 @@ -23,7 +23,6 @@ <string>editable_columns</string> <string>report_tree</string> <string>report_root_list</string> - <string>list_action</string> </list> </value> </item> @@ -244,10 +243,6 @@ <key> <string>form_id</string> </key> <value> <string>Base_viewFieldLibrary</string> </value> </item> - <item> - <key> <string>list_action</string> </key> - <value> <string>Project_viewLineList</string> </value> - </item> <item> <key> <string>list_method</string> </key> <value> diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index fb8a210573a155254893b7e53ff3612be28795d7..00c22e59835ed91568b7e79835365efdb3abd342 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -428 \ No newline at end of file +429 \ No newline at end of file