Преглед изворни кода

HUE-8530 [organization] Handle forms import dependencies when off

Romain пре 6 година
родитељ
комит
3e9fd3e29b
2 измењених фајлова са 4 додато и 2 уклоњено
  1. 3 1
      apps/useradmin/src/useradmin/forms.py
  2. 1 1
      apps/useradmin/src/useradmin/tests.py

+ 3 - 1
apps/useradmin/src/useradmin/forms.py

@@ -211,7 +211,9 @@ if ENABLE_ORGANIZATIONS.get():
 
     class Meta(django.contrib.auth.forms.UserChangeForm.Meta):
       model =  User
-      fields = ["first_name", "last_name", "email", "ensure_home_directory", "organization"]
+      fields = ["first_name", "last_name", "email", "ensure_home_directory"]
+      if ENABLE_ORGANIZATIONS.get():
+        fields.append('organization') # Because of import logic
 
     def __init__(self, *args, **kwargs):
       super(OrganizationUserChangeForm, self).__init__(*args, **kwargs)

+ 1 - 1
apps/useradmin/src/useradmin/tests.py

@@ -40,7 +40,7 @@ import desktop.conf
 
 from desktop import appmanager
 from desktop.auth.backend import is_admin
-from desktop.conf import APP_BLACKLIST ENABLE_ORGANIZATIONS
+from desktop.conf import APP_BLACKLIST, ENABLE_ORGANIZATIONS
 from desktop.lib.django_test_util import make_logged_in_client
 from desktop.lib.test_utils import grant_access
 from desktop.views import home