[Erp5-report] r38878 fabien - in /experimental/bt5/erp5_credential: SkinTemplateItem/portal...

[nobody at svn.erp5.org]

Author: fabien
Date: Tue Oct  5 10:07:50 2010
New Revision: 38878

URL: http://svn.erp5.org?rev=38878&view=rev
Log:
setting the role with the base_category don't works (setRole('role/member')). Remove the base_category.
remove useless white spaces

Modified:
    experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_updatePersonAssignment.xml
    experimental/bt5/erp5_credential/bt/revision

Modified: experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_updatePersonAssignment.xml
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_updatePersonAssignment.xml?rev=38878&r1=38877&r2=38878&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_updatePersonAssignment.xml [utf8] (original)
+++ experimental/bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/CredentialRequest_updatePersonAssignment.xml [utf8] Tue Oct  5 10:07:50 2010
@@ -63,17 +63,18 @@ organisation = context.getDestinationDec
 assignment_configuration = {}\n
 #Look on current assignement\n
 old_role_list = context.portal_categories.role.getCategoryChildRelativeUrlList()\n
-for role in context.getRoleList(base=1):\n
+# XXX remove the base \'role/\'. A better way could be possible\n
+old_role_list = [x.replace(\'role/\', \'\', 1) for x in old_role_list]\n
+for role in context.getRoleList():\n
   has_assignment = person.countFolder(portal_type=\'Assignment\',\n
                                                role = role,\n
                                                validation_state = \'open\')\n
 \n
   assignment_configuration[role] = bool(has_assignment)\n
   old_role_list.remove(role)\n
- \n
+\n
 #Close old assignement\n
 context.CredentialRequest_closePersonAssignment(old_role_list)\n
-   \n
 \n
 #Initialisation\n
 assignment_duration = context.portal_preferences.getPreferredCredentialAssignmentDuration()\n
@@ -86,7 +87,7 @@ for role,create_assingment in assignment
     assignment_for_website = person.newContent(\n
         portal_type=\'Assignment\',\n
         title = \'%s %s Assignment\' % (context.getSite(\'\').capitalize(), role.capitalize()),\n
-        role = role, \n
+        role = role,\n
         site = context.getSite(),\n
         activity = context.getActivityList(),\n
         function = context.getFunctionList(),\n
@@ -96,8 +97,8 @@ for role,create_assingment in assignment
         )\n
 \n
     assignment_for_website.open()\n
-  else: \n
-    #Update assignment \n
+  else:\n
+    #Update assignment\n
     current_assignment_list = person.searchFolder(portal_type=\'Assignment\',\n
                                                 role = role,\n
                                                 validation_state = \'open\')\n
@@ -155,7 +156,10 @@ for role,create_assingment in assignment
                             <string>organisation</string>
                             <string>assignment_configuration</string>
                             <string>old_role_list</string>
+                            <string>append</string>
+                            <string>$append0</string>
                             <string>_getiter_</string>
+                            <string>x</string>
                             <string>role</string>
                             <string>has_assignment</string>
                             <string>bool</string>

Modified: experimental/bt5/erp5_credential/bt/revision
URL: http://svn.erp5.org/experimental/bt5/erp5_credential/bt/revision?rev=38878&r1=38877&r2=38878&view=diff
==============================================================================
--- experimental/bt5/erp5_credential/bt/revision [utf8] (original)
+++ experimental/bt5/erp5_credential/bt/revision [utf8] Tue Oct  5 10:07:50 2010
@@ -1 +1 @@
-251
\ No newline at end of file
+253
\ No newline at end of file