ERP5Workflow: fix adding permissions

Follow up of ff624fd2 (ERP5Workflow: newly added permission should be
acquired for all existing states., 2024-11-04) and cbef6282 (ERP5Workflow:
make sure not create duplicate permissions, 2024-11-05)

bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testERP5Workflow.py

@@ -194,6 +194,20 @@ class TestERP5Workflow(ERP5TypeTestCase):
       },
     )
 
+    workflow.setWorkflowManagedPermissionList(permission_list)
+    self.assertEqual(
+      state1.getAcquirePermissionList(),
+      ['View'],
+    )
+    self.assertEqual(
+      state1.getStatePermissionRoleListDict(),
+      {
+        'Access contents information': ('Assignor', 'Manager'),
+        'Modify portal content': ('Assignor', 'Manager'),
+        'View': ('Assignor', 'Manager'),
+      },
+    )
+
 
   def test_afterScript(self):
     workflow = self.workflow_module.newContent(

product/ERP5Type/Core/Workflow.py

@@ -1440,16 +1440,15 @@ class Workflow(XMLObject):
     return res
 
   def _setWorkflowManagedPermissionList(self, permission_list):
-    current_permission_list = self.getWorkflowManagedPermissionList()
+    added_permission_set = set(permission_list) - set(self.getWorkflowManagedPermissionList())
     self._baseSetWorkflowManagedPermission(permission_list)
-
     # Add/remove the added/removed Workflow permissions to each state
     for state in self.getStateValueList():
+      current_acquire_permission_set_or_added_permission_set = \
+          set(state.getAcquirePermissionList()) | added_permission_set
       state.setAcquirePermissionList(
-        list(
-          {e for e in state.getAcquirePermissionList() if e in permission_list}
-          | (set(permission_list) - set(current_permission_list))))
-
+        [e for e in permission_list
+          if e in current_acquire_permission_set_or_added_permission_set])
       permission_role_list_dict = state.getStatePermissionRoleListDict()
       state.setStatePermissionRoleListDict({
         permission: permission_role_list_dict.get(permission, [])