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

[nobody at svn.erp5.org]

Author: seb
Date: Thu Mar 13 18:42:35 2008
New Revision: 19869

URL: http://svn.erp5.org?rev=19869&view=rev
Log:
make sure to return only task lines related to the current project

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_getSourceProjectRelatedTaskReportList.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=19869&r1=19868&r2=19869&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml Thu Mar 13 18:42:35 2008
@@ -65,9 +65,13 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>task_list = [x.getObject() for x in \\\n
+            <value> <string>source_project_uid_list = [x.uid for x in context.portal_catalog(\n
+     relative_url=\'%s%%\' % context.getRelativeUrl())]\n
+\n
+task_list = [x.getObject() for x in \\\n
   context.portal_catalog(selection=selection, selection_report=selection_report, \n
-                         portal_type=\'Task\')]\n
+          portal_type=\'Task\',\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
@@ -124,6 +128,7 @@
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>x</string>
+                            <string>source_project_uid_list</string>
                             <string>task_list</string>
                             <string>task_line_list</string>
                             <string>task</string>

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskReportList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskReportList.xml?rev=19869&r1=19868&r2=19869&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskReportList.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskReportList.xml Thu Mar 13 18:42:35 2008
@@ -65,27 +65,25 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>task_list = [x.getObject() for x in \\\n
+            <value> <string>source_project_uid_list = [x.uid for x in context.portal_catalog(\n
+     relative_url=\'%s%%\' % context.getRelativeUrl())]\n
+\n
+task_list = [x.getObject() for x in \\\n
   context.portal_catalog(selection=selection, selection_report=selection_report, \n
                          portal_type=\'Task\',\n
+                         source_project_uid = source_project_uid_list,\n
                          simulation_state=context.getPortalDraftOrderStateList()+\n
                                           context.getPortalPlannedOrderStateList())]\n
 task_list.extend([x.getObject() for x in \\\n
   context.portal_catalog(selection=selection, selection_report=selection_report, \n
                          portal_type=\'Task Report\',\n
+                         source_project_uid = source_project_uid_list,\n
                          simulation_state=context.getPortalReservedInventoryStateList()+\n
                                           context.getPortalCurrentInventoryStateList())])\n
-context.log(\'sql sql for task reports\', context.portal_catalog(selection=selection, \n
-                         selection_report=selection_report, \n
-                         portal_type=\'Task Report\',\n
-                         simulation_state=context.getPortalReservedInventoryStateList()+\n
-                                          context.getPortalCurrentInventoryStateList(), src__=1))\n
 task_line_list = []\n
 for task in task_list:\n
   task_line_list.extend(task.objectValues(portal_type=(\'Task Line\', \'Task Report Line\')))\n
 \n
-#print context.portal_catalog(source_project_uid=context.getUid(), src__=1)\n
-#return printed\n
 return task_line_list\n
 </string> </value>
         </item>
@@ -138,6 +136,7 @@
                             <string>_getattr_</string>
                             <string>context</string>
                             <string>x</string>
+                            <string>source_project_uid_list</string>
                             <string>task_list</string>
                             <string>task_line_list</string>
                             <string>task</string>

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=19869&r1=19868&r2=19869&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision Thu Mar 13 18:42:35 2008
@@ -1,1 +1,1 @@
-413
+414