github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3397 from jumpserver/dev_bai 

Dev bai
pull/3400/head
BaiJiangJie 2019-10-29 18:00:42 +08:00 committed by GitHub
parent c29381e657 c7ecfd7943
commit c163427db2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/authentication/signals_handlers.py
View File

@ -47,7 +47,7 @@ def on_openid_login_success(sender, user=None, request=None, **kwargs):
@receiver(populate_user) @receiver(populate_user)
def on_ldap_create_user(sender, user, ldap_user, **kwargs): 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.source = user.SOURCE_LDAP
user.save() user.save()

2
apps/perms/api/user_remote_app_permission.py
View File

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

3
apps/terminal/api/command.py
View File

@ -29,6 +29,9 @@ class CommandQueryMixin:
default_days_ago = 5 default_days_ago = 5
def get_queryset(self): 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() date_from, date_to = self.get_date_range()
q = self.request.query_params q = self.request.query_params
multi_command_storage = get_multi_command_storage() multi_command_storage = get_multi_command_storage()