Bug fix

nursix · Jul 18, 2022 · dea16f4 · dea16f4
1 parent fd50e44
commit dea16f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-nursix-dev-5447-gdfa43e3d6 (2022-07-18 14:17:19)
+nursix-dev-5448-gfd50e444c (2022-07-18 15:07:17)
diff --git a/modules/core/aaa/auth.py b/modules/core/aaa/auth.py
@@ -4355,14 +4355,16 @@ def s3_remove_role(self, user_id, group_id, for_pe=DEFAULT):
         # Archive the memberships
         for m in memberships:
             deleted_fk = {"user_id": m.user_id,
-                          "group_id": m.group_id}
-            if for_pe:
-                deleted_fk["pe_id"] = for_pe
+                          "group_id": m.group_id,
+                          }
+            if m.pe_id:
+                deleted_fk["pe_id"] = m.pe_id
             deleted_fk = json.dumps(deleted_fk)
             m.update_record(deleted = True,
                             deleted_fk = deleted_fk,
                             user_id = None,
-                            group_id = None)
+                            group_id = None,
+                            )
 
         # Update roles for current user if required
         if self.user and str(user_id) == str(self.user.id):
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		nursix-dev-5447-gdfa43e3d6 (2022-07-18 14:17:19)
		nursix-dev-5448-gfd50e444c (2022-07-18 15:07:17)