call activate() in the same transaction otherwise we may get lots of...

call activate() in the same transaction otherwise we may get lots of UnsupportedWorkflowMethod errors.

bt5/erp5_credential/SkinTemplateItem/portal_skins/erp5_credential/ERP5Site_acceptSubmittedCredentials.xml

@@ -57,7 +57,8 @@ if portal.portal_preferences.getPreferredCredentialRequestAutomaticApproval():\n
   result = module.searchFolder(portal_type=\'Credential Request\',\n
       validation_state=\'submitted\')\n
   for document in result:\n
-    document.activate().accept()\n
+    if document.getValidationState() == \'submitted\':\n
+      document.accept()\n
 \n
 if portal.portal_preferences.getPreferredPersonCredentialUpdateAutomaticApproval() and \\\n
     portal.portal_preferences.getPreferredOrganisationCredentialUpdateAutomaticApproval():\n
@@ -65,7 +66,8 @@ if portal.portal_preferences.getPreferredPersonCredentialUpdateAutomaticApproval
   result = module.searchFolder(portal_type=\'Credential Update\',\n
       validation_state=\'submitted\')\n
   for document in result:\n
-    document.activate().accept()\n
+    if document.getValidationState() == \'submitted\':\n
+      document.accept()\n
 elif portal.portal_preferences.getPreferredPersonCredentialUpdateAutomaticApproval() and \\\n
     not portal.portal_preferences.getPreferredOrganisationCredentialUpdateAutomaticApproval():\n
   module = context.getDefaultModule(\'Credential Update\')\n
@@ -73,7 +75,8 @@ elif portal.portal_preferences.getPreferredPersonCredentialUpdateAutomaticApprov
       validation_state=\'submitted\')\n
   for document in result:\n
     if document.getDestinationDecisionValue().getPortalType() == \'Person\':\n
-      document.activate().accept()\n
+      if document.getValidationState() == \'submitted\':\n
+        document.accept()\n
 elif not portal.portal_preferences.getPreferredPersonCredentialUpdateAutomaticApproval() and \\\n
     portal.portal_preferences.getPreferredOrganisationCredentialUpdateAutomaticApproval():\n
   module = context.getDefaultModule(\'Credential Update\')\n
@@ -81,14 +84,16 @@ elif not portal.portal_preferences.getPreferredPersonCredentialUpdateAutomaticAp
       validation_state=\'submitted\')\n
   for document in result:\n
     if document.getDestinationDecisionValue().getPortalType() == \'Organisation\':\n
-      document.activate().accept()\n
+      if document.getValidationState() == \'submitted\':\n
+        document.accept()\n
 \n
 if portal.portal_preferences.getPreferredCredentialRecoveryAutomaticApproval():\n
   module = context.getDefaultModule(\'Credential Recovery\')\n
   result = module.searchFolder(portal_type=\'Credential Recovery\',\n
       validation_state=\'submitted\')\n
   for document in result:\n
-    document.activate().accept()\n
+    if document.getValidationState() == \'submitted\':\n
+      document.accept()\n
 </string> </value>
         </item>
         <item>

bt5/erp5_credential/bt/revision

-415
+416
\ No newline at end of file