javamickey
diff --git a/‎apps/common/forms.py‎
Lines changed: 0 additions & 3 deletions b/‎apps/common/forms.py‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎apps/common/views.py‎
Lines changed: 2 additions & 2 deletions b/‎apps/common/views.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎apps/jumpserver/settings.py‎
Lines changed: 1 addition & 0 deletions b/‎apps/jumpserver/settings.py‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎apps/locale/zh/LC_MESSAGES/django.mo‎
51 Bytes b/‎apps/locale/zh/LC_MESSAGES/django.mo‎
51 Bytes
@@ -78,9 +78,6 @@ class BasicSettingForm(BaseForm):
         max_length=1024, label=_("Email Subject Prefix"),
         initial="[Jumpserver] "
     )
-    AUTH_LDAP = forms.BooleanField(
-        label=_("Enable LDAP Auth"), initial=False, required=False
-    )
 
 
 class EmailSettingForm(BaseForm):
 
@@ -28,8 +28,6 @@ def post(self, request):
         form = self.form_class(request.POST)
         if form.is_valid():
             form.save()
-            if "AUTH_LDAP" in form.cleaned_data:
-                ldap_auth_enable.send(form.cleaned_data["AUTH_LDAP"])
             msg = _("Update setting successfully, please restart program")
             messages.success(request, msg)
             return redirect('settings:basic-setting')
@@ -82,6 +80,8 @@ def post(self, request):
         form = self.form_class(request.POST)
         if form.is_valid():
             form.save()
+            if "AUTH_LDAP" in form.cleaned_data:
+                ldap_auth_enable.send(form.cleaned_data["AUTH_LDAP"])
             msg = _("Update setting successfully, please restart program")
             messages.success(request, msg)
             return redirect('settings:ldap-setting')
 
@@ -391,6 +391,7 @@
     # }
 }
 
+
 # Django bootstrap3 setting, more see http://django-bootstrap3.readthedocs.io/en/latest/settings.html
 BOOTSTRAP3 = {
     'horizontal_label_class': 'col-md-2',
Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,6 @@ class BasicSettingForm(BaseForm):`
`78`	`78`	`max_length=1024, label=_("Email Subject Prefix"),`
`79`	`79`	`initial="[Jumpserver] "`
`80`	`80`	`)`
`81`		`- AUTH_LDAP = forms.BooleanField(`
`82`		`- label=_("Enable LDAP Auth"), initial=False, required=False`
`83`		`- )`
`84`	`81`
`85`	`82`
`86`	`83`	`class EmailSettingForm(BaseForm):`
Original file line number	Diff line number	Diff line change
`@@ -391,6 +391,7 @@`
`391`	`391`	`# }`
`392`	`392`	`}`
`393`	`393`
	`394`	`+`
`394`	`395`	`# Django bootstrap3 setting, more see http://django-bootstrap3.readthedocs.io/en/latest/settings.html`
`395`	`396`	`BOOTSTRAP3 = {`
`396`	`397`	`'horizontal_label_class': 'col-md-2',`