2008-04-12 Seb

* revert new domains. The last commit on Project_generateProjectDomain was imcompatible with existing reports.
* Added sort of lines for task report

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20826 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_generateProjectDomain.xml

@@ -68,17 +68,15 @@
             <value> <string>request = context.REQUEST\n
 \n
 project_line_portal_type = \'Project Line\'\n
+\n
 domain_list = []\n
 \n
-object_path = request.get(\'object_path\')\n
-if object_path is None:\n
-  # Sometimes the object_path not comes with the request, when you edit for example.\n
-  object_path = context.REQUEST.get(\'URL1\').split(\'/\')[-1]\n
+here = context.REQUEST[\'here\']\n
+\n
 \n
-domain_list = []\n
 \n
 if depth == 0:\n
-  category_list = [context.project_module.restrictedTraverse(object_path)]\n
+  category_list = here.contentValues(portal_type=project_line_portal_type)\n
   \n
 else:\n
   category_list = []\n
@@ -87,15 +85,16 @@ else:\n
     parent_category = \'/\'.join(parent_category.split(\'/\')[1:])\n
     category_list.extend(context.restrictedTraverse(parent_category).contentValues(portal_type=project_line_portal_type))\n
 \n
-i=0\n
+i = 0\n
 for category in category_list:\n
   domain = parent.generateTempDomain(id = \'%s_%s\' % (depth, i))\n
   domain.edit(title = category.getTitle(),\n
               membership_criterion_base_category = (\'source_project\', ), \n
-              membership_criterion_category = (category.getRelativeUrl(),),\n
+              membership_criterion_category = (\'source_project/\' + category.getRelativeUrl(),),\n
               domain_generator_method_id = script.id,\n
               uid = category.getUid())\n
   i += 1\n
+                \n
   domain_list.append(domain)\n
 \n
 return domain_list\n
@@ -149,9 +148,8 @@ return domain_list\n
                             <string>request</string>
                             <string>project_line_portal_type</string>
                             <string>domain_list</string>
-                            <string>object_path</string>
-                            <string>None</string>
                             <string>_getitem_</string>
+                            <string>here</string>
                             <string>category_list</string>
                             <string>parent_category_list</string>
                             <string>_getiter_</string>

bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskReportList.xml

@@ -84,6 +84,15 @@ 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
+\n
+def sortTaskLine(a, b):\n
+  result = cmp(a.getStartDate(), b.getStartDate())\n
+  if result == 0:\n
+    result = cmp(a.getTitle(), b.getTitle())\n
+  return result\n
+\n
+task_line_list.sort(sortTaskLine)\n
+\n
 return task_line_list\n
 </string> </value>
         </item>
@@ -140,6 +149,7 @@ return task_line_list\n
                             <string>task_list</string>
                             <string>task_line_list</string>
                             <string>task</string>
+                            <string>sortTaskLine</string>
                           </tuple>
                         </value>
                     </item>

bt5/erp5_project/bt/revision

-474
\ No newline at end of file
+477
\ No newline at end of file