Merge pull request #3397 from jumpserver/dev_bai

Dev bai

apps/authentication/signals_handlers.py

@@ -47,7 +47,7 @@ def on_openid_login_success(sender, user=None, request=None, **kwargs):
 
 @receiver(populate_user)
 def on_ldap_create_user(sender, user, ldap_user, **kwargs):
-    if user and user.name != 'admin':
+    if user and user.username != 'admin':
         user.source = user.SOURCE_LDAP
         user.save()
 

apps/perms/api/user_remote_app_permission.py

@@ -53,6 +53,8 @@ class UserGrantedRemoteAppsAsTreeApi(UserGrantedRemoteAppsApi):
     permission_classes = (IsOrgAdminOrAppUser,)
 
     def get_serializer(self, remote_apps=None, *args, **kwargs):
+        if remote_apps is None:
+            remote_apps = []
         only_remote_app = self.request.query_params.get('only', '0') == '1'
         tree_root = None
         data = []

apps/terminal/api/command.py

@@ -29,6 +29,9 @@ class CommandQueryMixin:
     default_days_ago = 5
 
     def get_queryset(self):
+        # 解决访问 /docs/ 问题
+        if hasattr(self, 'swagger_fake_view'):
+            return self.command_store.model.objects.none()
         date_from, date_to = self.get_date_range()
         q = self.request.query_params
         multi_command_storage = get_multi_command_storage()