From ab7a377d06a30ee1cc537b61fb5c231c0697f210 Mon Sep 17 00:00:00 2001
From: Kai <sistason@sistason.de>
Date: Sat, 13 Feb 2021 18:56:38 +0100
Subject: [PATCH 1/2] fixes #40 by recalculating groups _before_ to_ldap(),
 which sets the groups in ldap

---
 uffd/user/views_user.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/uffd/user/views_user.py b/uffd/user/views_user.py
index 14fcb690..dbbcd27e 100644
--- a/uffd/user/views_user.py
+++ b/uffd/user/views_user.py
@@ -155,16 +155,12 @@ def csvimport():
 						continue
 					role.add_member(newuser)
 
+			recalculate_user_groups(newuser)
+
 			result = newuser.to_ldap(new=True)
 			print(result)
 			if result:
 				send_passwordreset(newuser.loginname, new=True)
-
-				usergroups = set()
-				for role in Role.get_for_user(newuser).all():
-					usergroups.update(role.group_dns())
-				newuser.replace_group_dns(usergroups)
-
 				session.commit()
 				usersadded += 1
 			else:
-- 
GitLab


From 049d1f3caba298a651e05ce7179e687903a19134 Mon Sep 17 00:00:00 2001
From: Kai <sistason@sistason.de>
Date: Sun, 14 Feb 2021 01:22:54 +0100
Subject: [PATCH 2/2] removed obsolete debug-print

---
 uffd/user/views_user.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/uffd/user/views_user.py b/uffd/user/views_user.py
index dbbcd27e..77488a22 100644
--- a/uffd/user/views_user.py
+++ b/uffd/user/views_user.py
@@ -158,7 +158,6 @@ def csvimport():
 			recalculate_user_groups(newuser)
 
 			result = newuser.to_ldap(new=True)
-			print(result)
 			if result:
 				send_passwordreset(newuser.loginname, new=True)
 				session.commit()
-- 
GitLab