Skip to content

Commit 0e00451

Browse files
ibuleribuler
authored
Merge pull request jumpserver#2425 from jumpserver/dev
[Update] 修改ldap test密码为空
2 parents 232674b + 866e5d2 commit 0e00451

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

‎apps/common/serializers.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class MailTestSerializer(serializers.Serializer):
1212

1313
class LDAPTestSerializer(serializers.Serializer):
1414
AUTH_LDAP_SERVER_URI = serializers.CharField(max_length=1024)
15-
AUTH_LDAP_BIND_DN = serializers.CharField(max_length=1024)
16-
AUTH_LDAP_BIND_PASSWORD = serializers.CharField()
15+
AUTH_LDAP_BIND_DN = serializers.CharField(max_length=1024, required=False, allow_blank=True)
16+
AUTH_LDAP_BIND_PASSWORD = serializers.CharField(required=False, allow_blank=True)
1717
AUTH_LDAP_SEARCH_OU = serializers.CharField()
1818
AUTH_LDAP_SEARCH_FILTER = serializers.CharField()
1919
AUTH_LDAP_USER_ATTR_MAP = serializers.CharField()

‎apps/ops/views/celery.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# -*- coding: utf-8 -*-
22
#
3-
from django.views.generic import DetailView, TemplateView
3+
from django.views.generic import TemplateView
44

55
from common.permissions import AdminUserRequiredMixin
6-
from ..models import CeleryTask
76

87

98
__all__ = ['CeleryTaskLogView']

0 commit comments

Comments
 (0)