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

Merge pull request #2425 from jumpserver/dev 

[Update] 修改ldap test密码为空
pull/2486/head
老广 2019-02-22 19:21:21 +08:00 committed by GitHub
parent 232674b1c1 866e5d2011
commit 0e00451e1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/common/serializers.py
View File

@ -12,8 +12,8 @@ class MailTestSerializer(serializers.Serializer):
class LDAPTestSerializer(serializers.Serializer): class LDAPTestSerializer(serializers.Serializer):
AUTH_LDAP_SERVER_URI = serializers.CharField(max_length=1024) AUTH_LDAP_SERVER_URI = serializers.CharField(max_length=1024)
AUTH_LDAP_BIND_DN = serializers.CharField(max_length=1024) AUTH_LDAP_BIND_DN = serializers.CharField(max_length=1024, required=False, allow_blank=True)
AUTH_LDAP_BIND_PASSWORD = serializers.CharField() AUTH_LDAP_BIND_PASSWORD = serializers.CharField(required=False, allow_blank=True)
AUTH_LDAP_SEARCH_OU = serializers.CharField() AUTH_LDAP_SEARCH_OU = serializers.CharField()
AUTH_LDAP_SEARCH_FILTER = serializers.CharField() AUTH_LDAP_SEARCH_FILTER = serializers.CharField()
AUTH_LDAP_USER_ATTR_MAP = serializers.CharField() AUTH_LDAP_USER_ATTR_MAP = serializers.CharField()

3
apps/ops/views/celery.py
View File

@ -1,9 +1,8 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# #
from django.views.generic import DetailView, TemplateView from django.views.generic import TemplateView
from common.permissions import AdminUserRequiredMixin from common.permissions import AdminUserRequiredMixin
from ..models import CeleryTask
__all__ = ['CeleryTaskLogView'] __all__ = ['CeleryTaskLogView']