Просмотр исходного кода

HUE-8530 [organization] Add default organization when creating a new user

Romain 6 лет назад
Родитель
Сommit
8653c4ddb5

+ 2 - 2
apps/useradmin/src/useradmin/forms.py

@@ -211,7 +211,7 @@ class OrganizationUserChangeForm(UserChangeForm):
 
   class Meta(django.contrib.auth.forms.UserChangeForm.Meta):
     model =  User
-    fields = ["first_name", "last_name", "email", "ensure_home_directory"]
+    fields = ["first_name", "last_name", "email", "ensure_home_directory", "organization"]
 
   def __init__(self, *args, **kwargs):
     super(OrganizationUserChangeForm, self).__init__(*args, **kwargs)
@@ -269,7 +269,7 @@ class OrganizationSuperUserChangeForm(OrganizationUserChangeForm):
       # If the user exists already, we'll use its current group memberships
       self.initial['groups'] = set(self.instance.groups.all())
     else:
-      # If his is a new user, suggest the default group
+      # If this is a new user, suggest the default group
       default_group = get_default_user_group()
       if default_group is not None:
         self.initial['groups'] = set([default_group])

+ 1 - 0
desktop/libs/notebook/src/notebook/conf.py

@@ -35,6 +35,7 @@ def _remove_duplications(a_list):
   return list(OrderedDict.fromkeys(a_list))
 
 def check_permissions(user, interpreter, user_apps=None):
+  # TODO: port to cluster config
   if user_apps is None:
     user_apps = appmanager.get_apps_dict(user) # Expensive method
   return (interpreter == 'hive' and 'hive' not in user_apps) or \