Procházet zdrojové kódy

HUE-8530 [organization] Series of typo fixes

Romain před 5 roky
rodič
revize
f15cda2197

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

@@ -64,13 +64,14 @@ from useradmin.conf import DEFAULT_USER_GROUP
 
 if ENABLE_ORGANIZATIONS.get():
   from useradmin.models2 import OrganizationUser as User, OrganizationGroup as Group, Organization, default_organization, get_organization, \
-      _fitered_queryset
+      _fitered_queryset, get_user_request_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): return queryset
+  def get_user_request_organization(): pass
 
   monkey_patch_username_validator()
 
@@ -285,11 +286,6 @@ def get_default_user_group(**kwargs):
   return group
 
 
-def get_user_request_organization():
-  request = CrequestMiddleware.get_request()
-  return request.user.organization if request and hasattr(request, 'user') else default_organization()
-
-
 def update_app_permissions(**kwargs):
   """
   Keep in sync apps and connectors permissions into the database table.

+ 5 - 0
apps/useradmin/src/useradmin/models2.py

@@ -197,6 +197,11 @@ class OrganizationUser(AbstractUser):
     pass
 
 
+def get_user_request_organization():
+  request = CrequestMiddleware.get_request()
+  return request.user.organization if request and hasattr(request, 'user') and request.user.is_authenticated() else default_organization()
+
+
 def _fitered_queryset(queryset, by_owner=False):
   request = CrequestMiddleware.get_request()
 

+ 9 - 9
desktop/core/src/desktop/lib/connectors/models.py

@@ -63,7 +63,7 @@ AVAILABLE_CONNECTORS = _group_category_connectors(CONNECTOR_TYPES)
 
 
 def _get_installed_connectors(category=None, categories=None, dialect=None, interface=None, user=None):
-  connector = []
+  connectors = []
   connector_instances = [
       {
         'id': connector.id,
@@ -78,11 +78,11 @@ def _get_installed_connectors(category=None, categories=None, dialect=None, inte
   ] + [ # TODO move to samples? or auto
       {
         'id': i,
-        'nice_name':  config_connectors[i].NICE_NAME.get() or i,
+        'nice_name':  CONNECTORS.get()[i].NICE_NAME.get() or i,
         'description': '',
-        'dialect': config_connectors[i].DIALECT.get(),
-        'interface': config_connectors[i].INTERFACE.get(),
-        'settings': config_connectors[i].SETTINGS.get(),
+        'dialect': CONNECTORS.get()[i].DIALECT.get(),
+        'interface': CONNECTORS.get()[i].INTERFACE.get(),
+        'settings': CONNECTORS.get()[i].SETTINGS.get(),
         'is_demo': True,
       }
       for i in CONNECTORS.get()
@@ -99,16 +99,16 @@ def _get_installed_connectors(category=None, categories=None, dialect=None, inte
 
     if not connector_types:
       LOG.warn('Skipping connector %(id)s as connector dialect %(dialect)s or interface %(interface)s are not installed' % (
-          {'id': i, 'dialect': connector['dialect'], 'interface': connector['interface']}
+          {'id': connector['id'], 'dialect': connector['dialect'], 'interface': connector['interface']}
         )
       )
     else:
       connector_type = connector_types[0]
-      connector.append({
+      connectors.append({
         'nice_name': connector['nice_name'],
-        'name': i,
+        'name': connector['id'],
         'dialect': connector['dialect'],
-        'interface': connector['interface'],
+        'interface': connector['interface'] or connector_type['interface'],
         'settings': connector['settings'],
         'id': connector['id'],
         'category': connector_type['category'],