enable merge for group of users with no project membership

velis74 · Oct 25, 2023 · b6fc967 · b6fc967
1 parent 5e24d36
commit b6fc967
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/django_project_base/account/service/merge_users_service.py b/django_project_base/account/service/merge_users_service.py
@@ -77,7 +77,11 @@ def _change_user_pks(self, user, group):
                         qs = mdl.objects.filter(**{fld.attname: fld.to_python(usr)})
                         if is_project_related:
                             p_fld = is_project_related[0]
-                            qs = qs.filter(**{p_fld.attname: group.project.pk})
+                            qs = (
+                                qs.filter(**{p_fld.attname: group.project.pk})
+                                if getattr(group, "project", None)
+                                else qs.filter()
+                            )
 
                         m_items = []
                         if fld.many_to_one or fld.one_to_one: