From d08a1c3ddb0fce7b2dee4df56bccc4ab1a8bc782 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Wed, 17 Jan 2018 17:22:04 +0800
Subject: [PATCH] =?UTF-8?q?[Update]=20=E5=90=AF=E7=94=A8ldap=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/forms.py                 |   6 +++---
 apps/common/views.py                 |   4 ++--
 apps/locale/zh/LC_MESSAGES/django.mo | Bin 31608 -> 31614 bytes
 apps/locale/zh/LC_MESSAGES/django.po |   2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/common/forms.py b/apps/common/forms.py
index 073bb671f..6b83c54cc 100644
--- a/apps/common/forms.py
+++ b/apps/common/forms.py
@@ -72,9 +72,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):
@@ -129,3 +126,6 @@ class LDAPSettingForm(BaseForm):
     AUTH_LDAP_START_TLS = forms.BooleanField(
         label=_("Use SSL"), initial=False, required=False
     )
+    AUTH_LDAP = forms.BooleanField(
+        label=_("Enable LDAP Auth"), initial=False, required=False
+    )
diff --git a/apps/common/views.py b/apps/common/views.py
index 4135ca82c..43b249cee 100644
--- a/apps/common/views.py
+++ b/apps/common/views.py
@@ -25,8 +25,6 @@ class BasicSettingView(AdminUserRequiredMixin, TemplateView):
         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')
@@ -79,6 +77,8 @@ class LDAPSettingView(AdminUserRequiredMixin, TemplateView):
         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')
diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo
index 3d866a742aa33c001d3230ffb61d3ac13449f036..e11f9f5560cde51416848d6495e4036da7014744 100644
GIT binary patch
delta 2862
zcmXZedrX#P7{~F)NIdWo^eUzyin`2@n#HEGLR~t{w3fx%ifMDnK~xk)5L-QA5U#mA
zu#vgZY-Kj>;9-?Ea}BfQA)B*IOY@L)L`xf*<f!lOeSUv^?(4em`?{~^^uj+^x^-RY
zw)JF2m>vW{+3X;QVXb`$lZl%guXnu3zHdLon_0ITwf`{2@dwXev>n)s{B_j2<l@La
z#X*>u$aW$Jb?_KW!f}ot@ca}^Bmacs66{U97`5+t+kj(<SK<)-0@c{Bs0RK;HPo{t
z41z)i@scP}iaMYYRj>|qzzVzpn`|@QMf{rm5+5YKiW6``X=EKH6Stxc-tYJrs)19X
z6TjGtIGKqK$N6PZfk~*wrlPK-$oUFX;U#vt^Q&yL^DT}yqxNsJ;pYr=h2Pn8sDc-4
zC-x`qF()z`H9r=0Wd-(O=L@kX`B{$3ZH=wBYmi35;B^K$Y}ke>c+v}ga{QOQYP&q&
zy*yeU$6o9kfNE@*9fi8me8-R48MZtj&%cI&7S^L~@vEqUn-U9X4As~kyU+8793Qi%
zP<77ZFuaPYmpM0bB<fDyXA3dL`N4b!nYavfP_rhm#qnmx+c1Ot9>?FH-tM!geM$48
z#(Ueoc90!`G1lE<$786Dr!i20r%}(Y1a$`%;2^BU7_LLD+lV^&T^xyrQFS^|7m_+Z
z2nORFn1xd?hNZR&Ri|#gzyB2^bZgdnVhgI^cE|fr1rFI0m_q!sy^Jc@WxH2I>tm?=
z0Mw(%#?d&+^Q9Hse;rgsA_p5$8@8kFz%Ivo?EzFHN9>QN{eL*_!rsIw3nKg3AvPD&
zm>+|xKRNVZx-GKBs74l`4y?8>q7Gbb-*o;XOe4S7@lksQwf=(RU}3Z_6;(IPVxU`+
zgF0{)>QR&-pMFs1_;;IB8FfC;4oB@9g(^74PO{VOOgq;uMfQb3Lo^6hdZG!tQ)mO`
z;@i$2#T$vwpbl)a?e=d}1D&X^q{pIYeHQ9g4@K?E#W?0+jPrv62D;+M6Nw<0=eQQ*
z<k#Abb|>nfgQ$YX9iPVAiQ7@{Qs2dq<5BC&ZH=wRoAmv!VUUI!PzATzk5L=<*n{@C
z=i3~&qdv!L&SzEy!3g4^I25O%F0jHjqUvtI#P|OmgLD#~p}yNAr~;Qz1#VpuZOF$v
zi63&j6!pC~pbmHg<M;{o!LLvkb{6~LCDi_&)zO8HuJ-qz@5E$OXOCcCEONZi^UtB)
zje6Ao2QQ<32VOxv<MpUJ_!g$(7E}YfP>t<J)j#R{Z`Is?b$-nY;x*AP-fgIblk9X<
zftjAKbbht-EsnR^Pf-USKsENgJ&$VeqU{JhxQ;q7X=!v&I;y}h)K79As?hzYJ5Ydn
zWYbXlX4rDnz8bt28&Qq7qV|95`O`N1(}VxKAgwkkIKU1^70g4uWD}h)c773NkYDb2
zoqY#&;7(M7t*A!6_WU{QukZgd11(Hh7TuZ*)UzFk%4a*DgDP~l9q0U1`xt8dla8N3
x{c$R{%{Yg+74;J4KC61XrcWgX{B=SVsM>KNd)36`w%sqZt^Qy~+3fUN{s+)ydu{*#

delta 2855
zcmXZeeN2{B7{~D&QVe<o0}+OjrbG>;#ag1S7>-bv<=T>Ib4_iJ2)>|zsfBTeYpzrl
znVXJQX47iwmPsquFk8N4bCy|YC~2>1X=6-d)MobmJ@@ag&$+I1&ULQ)?ScRLlKT6S
z_I787X+aRw#DgG)jrIjhA#QcN+3|M!o_!y0XWd7r{l_p9zxVuQ+k>g(`%vqG1(Aan
z1Yu$#&xr!m!6kSLPH_C7=PNLS{Ns-2p)O!4YTs%b;zZ(gcqe{_YU~$O1An6$O0Eur
zU?ziDb(ENoI$$xXU=!+qwU~^pwhiwke$9T4(};Vq949S|Y{C@cPSnAN9G^rra3*x(
zXL}i^GSTC>v?eN0hH9)5btP5K*Pse7vum7x*|s^q#qkc*{@phGl!31B8{3U4c*$PJ
zT;inK$UM~i{irJ|w^N;;fwz*M<2Y{XZL{5gG!h0|85FT$H>%)iFZj{%pSIWbd;X^5
z*rMoGW}zC(w?(KcEp_~eon_+*dH(ebw6Ga<i(kc5+@4rKW2naV+k>7z>iDERgQ{~L
z$6zn2UiRY1yHI!X0XqX@oF6P?FdSE)4r<c`ZgITB@ovl}zu)m!sJHtZYTpf1;{%pN
zrrTUQ8e`0lvlB5?$5R-nz>}zFHxE^)7Vp4DjNvBKx^1X~-@&nX3{~ek>OuxB4T6z4
z2J^83V>sW|q3Sd(_4mJ)gl^47PwYe$+~fEls=!hEE#5}_lf8;6*l%y5)~D1(`7G3<
z$iwkigo%dgxc@q+jzkf*pbG6l-GL6r2kc?g#^d$})c)Tc_hTCIz-5s`>~LF%8O)cU
z>Q4?mm~N}=TvQ{qr~{YV=TQf)w{JMV7c<BoaD2j^MXkT&_+QK*9<)5F8|E<3Eh#`9
zI0yA8o<=_Xpvm!X_6Dl+VfB%tQ2UBdjh5IlJKfH<3v2_jFATzH5Ule=D-NVkJC4J*
zoIimBh|i)9ykIZdzfcWaM|~wp4bl1>RKp`s`wB4=i!sLeK{*3m@neZZ5L7#E#7y!V
z?KZm)b<h!1!BdXA@NVLZsCOy7F>)emecaaDW=z-jzkz|CNjs|GF8cv$<9>U@p7Q(!
z#}`qb<2C2AR|LU5#3OJtR-!Jj#<rm9wqxS^f0w}!5}%;H+vBJLS5O6pJ`-&y#bV-z
z9XFu9_Yif!>zIijVitaZy0CLN46mT}C$Eey^uCq;{!5*hjOuI}4#g_Ri#)#y^=>qy
z{y%sT^*itq>KSiF-N83;Fz!S((1B{~5UT!Z=YL(v{a5GLydbtJ`o$ZGT3BYMqYBLS
z{9@<VJHN&8F8eX+;KQiKzO(014PLfAp$C1a18<-XN?RQj$VdGo7o!S|N8N#P)FYdM
z+BeI_Q3u!KBy2&|>qPDU+VfpD{KJEPydd@2s9=^Ig(_H#ddVJgey;ONFq`}u$D8ci
zr~~(*8tg<h@}=jyF<0OJRR&r(@VV&LWT2kyFjPLz`2tj-v37#<mG)88`X?Meh5F+Z
lw{2KU+=+S#3!7Ar*K}rLz+Wd+fx3>aQLj{V)WwJ7{0{+#bmIU3

diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po
index 55e035bfe..50aec9767 100644
--- a/apps/locale/zh/LC_MESSAGES/django.po
+++ b/apps/locale/zh/LC_MESSAGES/django.po
@@ -1311,7 +1311,7 @@ msgstr "Email主题前缀"
 
 #: common/forms.py:76
 msgid "Enable LDAP Auth"
-msgstr "LDAP认证"
+msgstr "开启LDAP认证"
 
 #: common/forms.py:82
 msgid "SMTP host"