Browse Source

HUE-8758 [connectors] Small styling updates in useradmin and desktop

Romain 5 years ago
parent
commit
41db606f20

+ 14 - 11
apps/useradmin/src/useradmin/views.py

@@ -540,7 +540,8 @@ def edit_permission(request, app=None, priv=None):
     form = PermissionsEditForm(instance=instance)
     form = PermissionsEditForm(instance=instance)
   if request.method == 'POST' and is_embeddable:
   if request.method == 'POST' and is_embeddable:
     return JsonResponse(
     return JsonResponse(
-      {'status': -1, 'errors': [{'id': f.id_for_label, 'message': f.errors} for f in form if f.errors]})
+        {'status': -1, 'errors': [{'id': f.id_for_label, 'message': f.errors} for f in form if f.errors]}
+    )
   else:
   else:
     return render('edit_permissions.mako', request, {
     return render('edit_permissions.mako', request, {
       'form': form,
       'form': form,
@@ -699,7 +700,8 @@ def add_ldap_groups(request):
 
 
   if request.method == 'POST' and is_embeddable:
   if request.method == 'POST' and is_embeddable:
     return JsonResponse(
     return JsonResponse(
-      {'status': -1, 'errors': [{'id': f.id_for_label, 'message': f.errors} for f in form if f.errors]})
+        {'status': -1, 'errors': [{'id': f.id_for_label, 'message': f.errors} for f in form if f.errors]}
+    )
   else:
   else:
     return render('edit_group.mako', request, dict(form=form, action=request.path, ldap=True, is_embeddable=is_embeddable))
     return render('edit_group.mako', request, dict(form=form, action=request.path, ldap=True, is_embeddable=is_embeddable))
 
 
@@ -735,8 +737,7 @@ def sync_ldap_users_groups(request):
 
 
       failed_ldap_users = []
       failed_ldap_users = []
 
 
-      sync_ldap_users_and_groups(connection, is_ensuring_home_directory, request.fs,
-                                 failed_users=failed_ldap_users)
+      sync_ldap_users_and_groups(connection, is_ensuring_home_directory, request.fs, failed_users=failed_ldap_users)
 
 
       request.audit = {
       request.audit = {
         'operation': 'SYNC_LDAP_USERS_GROUPS',
         'operation': 'SYNC_LDAP_USERS_GROUPS',
@@ -756,7 +757,8 @@ def sync_ldap_users_groups(request):
 
 
   if request.method == 'POST' and is_embeddable:
   if request.method == 'POST' and is_embeddable:
     return JsonResponse(
     return JsonResponse(
-      {'status': -1, 'errors': [{'id': f.id_for_label, 'message': f.errors} for f in form if f.errors]})
+        {'status': -1, 'errors': [{'id': f.id_for_label, 'message': f.errors} for f in form if f.errors]}
+    )
   else:
   else:
     return render("sync_ldap_users_groups.mako", request, dict(path=request.path, form=form, is_embeddable=is_embeddable))
     return render("sync_ldap_users_groups.mako", request, dict(path=request.path, form=form, is_embeddable=is_embeddable))
 
 
@@ -779,14 +781,15 @@ def sync_ldap_users_and_groups(connection, is_ensuring_home_directory=False, fs=
 
 
 
 
 def import_ldap_users(connection, user_pattern, sync_groups, import_by_dn, server=None, failed_users=None):
 def import_ldap_users(connection, user_pattern, sync_groups, import_by_dn, server=None, failed_users=None):
-  return _import_ldap_users(connection, user_pattern, sync_groups=sync_groups, import_by_dn=import_by_dn, server=server,
-                            failed_users=failed_users)
+  return _import_ldap_users(
+      connection, user_pattern, sync_groups=sync_groups, import_by_dn=import_by_dn, server=server, failed_users=failed_users
+  )
 
 
 
 
-def import_ldap_groups(connection, group_pattern, import_members, import_members_recursive, sync_users, import_by_dn,
-                       failed_users=None):
-  return _import_ldap_groups(connection, group_pattern, import_members, import_members_recursive, sync_users,
-                             import_by_dn, failed_users=failed_users)
+def import_ldap_groups(connection, group_pattern, import_members, import_members_recursive, sync_users, import_by_dn, failed_users=None):
+  return _import_ldap_groups(
+      connection, group_pattern, import_members, import_members_recursive, sync_users, import_by_dn, failed_users=failed_users
+  )
 
 
 
 
 def get_find_groups_filter(ldap_info, server=None):
 def get_find_groups_filter(ldap_info, server=None):

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

@@ -106,7 +106,7 @@ def is_admin(user):
   is_admin = False
   is_admin = False
   if hasattr(user, 'is_superuser'):
   if hasattr(user, 'is_superuser'):
     is_admin = user.is_superuser
     is_admin = user.is_superuser
-  if not is_admin and user.is_authenticated() and not ENABLE_ORGANIZATIONS.get():  # Admin group only within an organization if later is enabled
+  if not is_admin and user.is_authenticated() and not ENABLE_ORGANIZATIONS.get():  # Admin group activated only in organization mode.
     try:
     try:
       user = rewrite_user(user)
       user = rewrite_user(user)
       is_admin = user.has_hue_permission(action="superuser", app="useradmin")
       is_admin = user.has_hue_permission(action="superuser", app="useradmin")

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

@@ -36,8 +36,7 @@ LOG = logging.getLogger(__name__)
 
 
 def hue_permission_required(action, app):
 def hue_permission_required(action, app):
   """
   """
-  Checks that the user has permissions to do
-  action 'action' on app 'app'.
+  Checks that the user has permissions to do action 'action' on app 'app'.
 
 
   Note that user must already be logged in.
   Note that user must already be logged in.
   """
   """

+ 3 - 3
desktop/core/src/desktop/lib/fs/proxyfs.py

@@ -47,7 +47,7 @@ class ProxyFS(object):
 
 
     self._name = name
     self._name = name
     self._fs_dict = filesystems_dict
     self._fs_dict = filesystems_dict
-    self._user = {'user': None} # wrapping in an object to avoid triggering __getattr__ / __setattr__
+    self._user = {'user': None}  # Wrapping in an object to avoid triggering __getattr__ / __setattr__
     self._default_scheme = default_scheme
     self._default_scheme = default_scheme
     self._default_fs = filesystems_dict[self._default_scheme](name, user=None)
     self._default_fs = filesystems_dict[self._default_scheme](name, user=None)
 
 
@@ -74,7 +74,7 @@ class ProxyFS(object):
     from desktop.auth.backend import rewrite_user  # Avoid cyclic loop
     from desktop.auth.backend import rewrite_user  # Avoid cyclic loop
     try:
     try:
       filebrowser_action = fs.filebrowser_action()
       filebrowser_action = fs.filebrowser_action()
-      #if not filebrowser_action (hdfs) then handle permission via doas else check permission in hue
+      # If not filebrowser_action (hdfs) then handle permission via doas else check permission in hue
       if not filebrowser_action:
       if not filebrowser_action:
         return True
         return True
       lookup = {orm_user_lookup(): self.getuser()}
       lookup = {orm_user_lookup(): self.getuser()}
@@ -214,7 +214,7 @@ class ProxyFS(object):
     return fs.mktemp(subdir=subdir, prefix=prefix, basedir=basedir)
     return fs.mktemp(subdir=subdir, prefix=prefix, basedir=basedir)
 
 
   def purge_trash(self):
   def purge_trash(self):
-    fs = self._get_fs() # Only webhdfs supports trash.
+    fs = self._get_fs()  # Only webhdfs supports trash.
     if fs and hasattr(fs, 'purge_trash'):
     if fs and hasattr(fs, 'purge_trash'):
       fs.purge_trash()
       fs.purge_trash()