Sfoglia il codice sorgente

HUE-8530 [organization] Fix a series of bad imports

Romain 5 anni fa
parent
commit
9fea9fc11b

+ 1 - 1
apps/filebrowser/src/filebrowser/forms.py

@@ -32,7 +32,7 @@ from aws.s3 import S3A_ROOT, normpath as s3_normpath
 from azure.abfs.__init__ import ABFS_ROOT, normpath as abfs_normpath
 from desktop.lib import i18n
 from hadoop.fs import normpath
-from useradmin.models import User, Group, default_organization
+from useradmin.models import User, Group
 
 from filebrowser.lib import rwx
 

+ 1 - 1
apps/filebrowser/src/filebrowser/views_test.py

@@ -55,7 +55,7 @@ from desktop.lib.view_util import location_to_url
 from desktop.conf import is_oozie_enabled
 from hadoop import pseudo_hdfs4
 from hadoop.conf import UPLOAD_CHUNK_SIZE
-from useradmin.models import User, Group, default_organization
+from useradmin.models import User, Group
 
 from filebrowser.conf import ENABLE_EXTRACT_UPLOADED_ARCHIVE, MAX_SNAPPY_DECOMPRESSION_SIZE
 from filebrowser.lib.rwx import expand_mode

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

@@ -31,7 +31,8 @@ from desktop.lib.django_util import get_username_re_rule, get_groupname_re_rule
 from desktop.settings import LANGUAGES
 
 from useradmin.hue_password_policy import hue_get_password_validators
-from useradmin.models import GroupPermission, HuePermission, get_default_user_group, User, Group, default_organization, Organization
+from useradmin.models import GroupPermission, HuePermission, get_default_user_group, User, Group, Organization
+from useradmin.organization import default_organization
 
 
 LOG = logging.getLogger(__name__)

+ 2 - 6
apps/useradmin/src/useradmin/models.py

@@ -59,18 +59,14 @@ from desktop.lib.idbroker.conf import is_idbroker_enabled
 from desktop.monkey_patches import monkey_patch_username_validator
 
 from useradmin.conf import DEFAULT_USER_GROUP
+from useradmin.models2 import Organization
 from useradmin.permissions import HuePermission, GroupPermission, LdapGroup
 
 if ENABLE_ORGANIZATIONS.get():
-  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, Organization, get_organization
-  from useradmin.organization import _fitered_queryset, get_user_request_organization, default_organization
+  from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, get_organization
 else:
   from django.contrib.auth.models import User, Group
-  class Organization(): pass
-  def default_organization(): pass
   def get_organization(): pass
-  def _fitered_queryset(queryset, *args, **kwargs): return queryset
-  def get_user_request_organization(): pass
 
   monkey_patch_username_validator()
 

+ 2 - 1
apps/useradmin/src/useradmin/permissions.py

@@ -23,10 +23,11 @@ from django.utils.translation import ugettext_lazy as _t
 from desktop.conf import ENABLE_ORGANIZATIONS, ENABLE_CONNECTORS
 from desktop.lib.connectors.models import Connector
 
+from useradmin.organization import _fitered_queryset, get_user_request_organization
+
 
 if ENABLE_ORGANIZATIONS.get():
   from useradmin.models2 import OrganizationGroup as Group, Organization
-  from useradmin.organization import _fitered_queryset
 else:
   from django.contrib.auth.models import Group
 

+ 2 - 1
desktop/core/src/desktop/auth/backend.py

@@ -53,7 +53,8 @@ from desktop.conf import AUTH, LDAP, OIDC, ENABLE_ORGANIZATIONS
 from desktop.settings import LOAD_BALANCER_COOKIE
 
 from useradmin import ldap_access
-from useradmin.models import get_profile, get_default_user_group, UserProfile, User, Organization, get_organization
+from useradmin.organization import default_organization
+from useradmin.models import get_profile, get_default_user_group, UserProfile, User
 
 
 LOG = logging.getLogger(__name__)

+ 2 - 1
desktop/core/src/desktop/lib/django_test_util.py

@@ -22,7 +22,8 @@ import json
 import django.test.client
 import nose.tools
 
-from useradmin.models import User, Group, default_organization
+from useradmin.models import User, Group
+from useradmin.organization import Organization
 
 
 class Client(django.test.client.Client):

+ 2 - 1
desktop/core/src/desktop/models.py

@@ -43,7 +43,8 @@ from django.utils.translation import ugettext as _, ugettext_lazy as _t
 from dashboard.conf import get_engines, HAS_REPORT_ENABLED
 from kafka.conf import has_kafka
 from notebook.conf import DEFAULT_LIMIT, SHOW_NOTEBOOKS, get_ordered_interpreters
-from useradmin.models import User, Group, get_organization, _fitered_queryset
+from useradmin.models import User, Group, get_organization
+from useradmin.organization import _fitered_queryset
 
 from desktop import appmanager
 from desktop.auth.backend import is_admin