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

[nobody at svn.erp5.org]

Author: romain
Date: Wed Mar 19 14:59:53 2008
New Revision: 20039

URL: http://svn.erp5.org?rev=20039&view=rev
Log:
Fix TaskReportModule_generateProjectDomain in order to display correctly related Projects

Modified:
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateProjectDomain.xml
    erp5/trunk/bt5/erp5_project/bt/revision

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateProjectDomain.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateProjectDomain.xml?rev=20039&r1=20038&r2=20039&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateProjectDomain.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_generateProjectDomain.xml Wed Mar 19 14:59:53 2008
@@ -68,18 +68,28 @@
             <value> <string>request = context.REQUEST\n
 domain_list = []\n
 \n
+\n
 if depth == 0:\n
-  category_list = [ ]\n
-  for i in context.portal_selections.getSelectionValueList(context=context,\n
-                                                           selection_name= \'task_report_module_selection\'):\n
-    category_list.extend([j for j in i.getSourceProjectValueList(portal_type="Project") if j not in category_list])\n
+  category_list = []\n
+  for task in context.portal_selections.getSelectionValueList(context=context,\n
+                                                           selection_name=\'task_report_module_selection\'):\n
+    source_project_value_list = \\\n
+      task.getSourceProjectValueList(portal_type=["Project", "Project Line"])\n
+    for source_project_value in source_project_value_list:\n
+      if source_project_value.getPortalType() == \'Project\':\n
+        category = source_project_value\n
+      else:\n
+        category = source_project_value.getExplanationValue()\n
+      if category not in category_list:\n
+        category_list.append(category)\n
   \n
 else:\n
-  category_list = [ ]\n
+  category_list = []\n
   for i in context.portal_selections.getSelectionValueList(context=context,\n
                                                            selection_name=\'task_report_module_selection\'):\n
     category_list.extend([j for j in i.getSourceProjectValueList(portal_type=["Project Line", "Project Milestones"]) \\\n
-                                                            if (j not in category_list) and ( j.getParentRelativeUrl() in parent.getMembershipCriterionCategoryList()) ])\n
+                                                            if (j not in category_list) and (j.getParentRelativeUrl() in parent.getMembershipCriterionCategoryList())])\n
+\n
 \n
 for category in category_list:\n
   domain = parent.generateTempDomain(id = \'sub\' + category.getId() )\n
@@ -143,11 +153,14 @@
                             <string>domain_list</string>
                             <string>category_list</string>
                             <string>_getiter_</string>
+                            <string>task</string>
+                            <string>source_project_value_list</string>
+                            <string>source_project_value</string>
+                            <string>category</string>
                             <string>i</string>
                             <string>append</string>
                             <string>$append0</string>
                             <string>j</string>
-                            <string>category</string>
                             <string>domain</string>
                             <string>script</string>
                           </tuple>

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=20039&r1=20038&r2=20039&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision Wed Mar 19 14:59:53 2008
@@ -1,1 +1,1 @@
-445
+446