Merge pull request #2425 from jumpserver/dev

[Update] 修改ldap test密码为空

apps/common/serializers.py

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

apps/ops/views/celery.py

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