[Erp5-report] r21062 - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp5_bas...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed May 21 16:36:12 2008
New Revision: 21062

URL: http://svn.erp5.org?rev=21062&view=rev
Log:
Take into account the group from open Assignments in Person_getPrimaryGroup

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml?rev=21062&r1=21061&r2=21062&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPrimaryGroup.xml Wed May 21 16:36:12 2008
@@ -65,7 +65,9 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>"""\n
+            <value> <string encoding="cdata"><![CDATA[
+
+"""\n
   Returns a group category based on career\n
   and or assignments in such way that the returned\n
   value describes the most accurately the default group\n
@@ -79,11 +81,24 @@
   (to be implemented).\n
 """\n
 \n
-try:\n
-  return context.default_career.getGroup()\n
-except AttributeError:\n
-  return None\n
-</string> </value>
+from DateTime import DateTime\n
+now = DateTime()\n
+\n
+for assignment in context.contentValues(portal_type=\'Assignment\',\n
+                     checked_permission=\'Access contents information\'):\n
+  \n
+  if assignment.getGroup() \\\n
+      and assignment.getValidationState() == \'open\' \\\n
+      and ( assignment.getStartDate() is None or\n
+            assignment.getStartDate() <= now <= assignment.getStopDate()):\n
+   return assignment.getGroup()\n
+\n
+# no group found on open assignments, returns the default group\n
+# (on a person document this is acquired on the default career\'s subordination)\n
+return context.getGroup()\n
+
+
+]]></string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -131,9 +146,12 @@
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
+                            <string>DateTime</string>
+                            <string>now</string>
+                            <string>_getiter_</string>
                             <string>_getattr_</string>
                             <string>context</string>
-                            <string>AttributeError</string>
+                            <string>assignment</string>
                             <string>None</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=21062&r1=21061&r2=21062&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision Wed May 21 16:36:12 2008
@@ -1,1 +1,1 @@
-299
+300