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

[nobody at svn.erp5.org]

Author: romain
Date: Wed Mar 19 18:47:58 2008
New Revision: 20058

URL: http://svn.erp5.org?rev=20058&view=rev
Log:
Display all Task/Task Reports which are not strictly related to the Project/Project Line.

Modified:
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_generateValidatedProjectDomain.xml
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml
    erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml
    erp5/trunk/bt5/erp5_project/bt/revision

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_generateValidatedProjectDomain.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_generateValidatedProjectDomain.xml?rev=20058&r1=20057&r2=20058&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_generateValidatedProjectDomain.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Base_generateValidatedProjectDomain.xml Wed Mar 19 18:47:58 2008
@@ -78,12 +78,22 @@
 \n
 for category in category_list:\n
   domain = parent.generateTempDomain(id=\'sub%s\' % category.getId())\n
+  \n
+  membership_criterion_category = []\n
+  sub_category_list = [category]\n
+  while sub_category_list:\n
+    sub_category = sub_category_list.pop()\n
+    membership_criterion_category.append(\'source_project/%s\' % sub_category.getRelativeUrl())\n
+    sub_category_list.extend(sub_category.contentValues(portal_type=\'Project Line\'))\n
+\n
   domain.edit(title = category.getTitle(),\n
-              membership_criterion_base_category = (\'source_project\', ), \n
-              membership_criterion_category = (\'source_project/%s\' % category.getRelativeUrl(),),\n
+              membership_criterion_base_category = (\'source_project\', ),\n
+              membership_criterion_category = membership_criterion_category,\n
               domain_generator_method_id = script.id,\n
               parent_url=category.getRelativeUrl(),\n
               uid = category.getUid())\n
+\n
+  context.log(str(membership_criterion_category))\n
                 \n
   domain_list.append(domain)\n
 \n
@@ -151,7 +161,11 @@
                             <string>parent_object</string>
                             <string>category</string>
                             <string>domain</string>
+                            <string>membership_criterion_category</string>
+                            <string>sub_category_list</string>
+                            <string>sub_category</string>
                             <string>script</string>
+                            <string>str</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml?rev=20058&r1=20057&r2=20058&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskModule_viewTaskList/listbox.xml Wed Mar 19 18:47:58 2008
@@ -254,10 +254,6 @@
                           <string>region</string>
                           <string>Region</string>
                         </tuple>
-                        <tuple>
-                          <string>validated_project_domain</string>
-                          <string>Open Project</string>
-                        </tuple>
                       </list>
                     </value>
                 </item>

Modified: erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml?rev=20058&r1=20057&r2=20058&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml (original)
+++ erp5/trunk/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/TaskReportModule_viewTaskReportList/listbox.xml Wed Mar 19 18:47:58 2008
@@ -250,10 +250,6 @@
                           <string>region</string>
                           <string>region</string>
                         </tuple>
-                        <tuple>
-                          <string>validated_project_domain</string>
-                          <string>Open Project</string>
-                        </tuple>
                       </list>
                     </value>
                 </item>

Modified: erp5/trunk/bt5/erp5_project/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_project/bt/revision?rev=20058&r1=20057&r2=20058&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_project/bt/revision (original)
+++ erp5/trunk/bt5/erp5_project/bt/revision Wed Mar 19 18:47:58 2008
@@ -1,1 +1,1 @@
-447
+448