[Erp5-report] r19901 - in /erp5/trunk/bt5/erp5_project: SkinTemplateItem/portal_skins/erp5_...

[nobody at svn.erp5.org]

Author: romain
Date: Fri Mar 14 14:50:03 2008
New Revision: 19901

URL: http://svn.erp5.org?rev=19901&view=rev
Log:
Only use Project Line in Project_generateProjectDomain

Modified:
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateProjectDomain.xml
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml
    erp5/trunk/bt5/erp5_project/bt/revision

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateProjectDomain.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateProjectDomain.xml?rev=19901&r1=19900&r2=19901&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateProjectDomain.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateProjectDomain.xml Fri Mar 14 14:50:03 2008
@@ -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 @@
 \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 @@
   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 @@
                             <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>

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=19901&r1=19900&r2=19901&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_viewTaskList/listbox.xml Fri Mar 14 14:50:03 2008
@@ -23,7 +23,6 @@
                 <string>editable_columns</string>
                 <string>report_tree</string>
                 <string>report_root_list</string>
-                <string>list_action</string>
               </list>
             </value>
         </item>
@@ -243,10 +242,6 @@
                 <item>
                     <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>

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=19901&r1=19900&r2=19901&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision Fri Mar 14 14:50:03 2008
@@ -1,1 +1,1 @@
-428
+429