Browse Source

HUE-8530 [organization] Add proper default group to users

Romain 5 năm trước cách đây
mục cha
commit
174562ddaa

+ 4 - 1
apps/useradmin/src/useradmin/models2.py

@@ -97,7 +97,7 @@ class OrganizationGroup(models.Model):
     unique_together = ('name', 'organization',)
 
   def __str__(self):
-    return '%s %s' % (self.organization, self.name)
+    return '%s @ %s' % (self.name, self.organization)
 
 
 class UserManager(BaseUserManager):
@@ -175,6 +175,9 @@ class OrganizationUser(AbstractUser):
 
   objects = UserManager()
 
+  def __str__(self):
+    return '%s @ %s' % (self.name, self.organization)
+
   @property
   def username(self):
     return self.email

+ 4 - 3
desktop/core/src/desktop/auth/backend.py

@@ -169,13 +169,14 @@ def create_user(username, password, is_superuser=True):
   else:
     user.set_password(password)
 
-  if ENABLE_ORGANIZATIONS.get():
-    user.is_admin = is_superuser or not organization.organizationuser_set.exists() or not organization.is_multi_user
-
   user.is_superuser = is_superuser
 
   user.save()
 
+  if ENABLE_ORGANIZATIONS.get():
+    user.is_admin = is_superuser or not organization.organizationuser_set.exists() or not organization.is_multi_user
+    ensure_has_a_group(user)
+
   return user
 
 def find_or_create_user(username, password=None, is_superuser=True):