From f5531b6065662431ee8e5ddea2a988cd9b36b493 Mon Sep 17 00:00:00 2001
From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com>
Date: Mon, 6 Aug 2018 16:08:05 +0800
Subject: [PATCH] =?UTF-8?q?=20[Update]=20xpack/orgs=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD-js;=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8DLabel=E7=BB=A7=E6=89=BFOrg=E5=90=8Ebug;=20(#1?=
 =?UTF-8?q?644)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [Update] 更新xpack下orgs的翻译信息

* [Update] 更新model Label，继承OrgModelMixin;

* [Update] xpack/orgs组织添加删除功能-js; 修复Label继承Org后bug;

* [Bugfix] 修复小bug
---
 apps/assets/api/label.py                      |   5 +-
 apps/assets/models/label.py                   |   3 +-
 apps/i18n/zh/LC_MESSAGES/django.mo            | Bin 37050 -> 37547 bytes
 apps/i18n/zh/LC_MESSAGES/django.po            | 152 ++++++++++++++----
 apps/static/js/jumpserver.js                  |  36 +++++
 .../users/user_otp_authentication.html        |   2 +-
 6 files changed, 167 insertions(+), 31 deletions(-)

diff --git a/apps/assets/api/label.py b/apps/assets/api/label.py
index 3466c3ec3..e5391c76a 100644
--- a/apps/assets/api/label.py
+++ b/apps/assets/api/label.py
@@ -27,7 +27,6 @@ __all__ = ['LabelViewSet']
 
 
 class LabelViewSet(BulkModelViewSet):
-    queryset = Label.objects.annotate(asset_count=Count("assets"))
     permission_classes = (IsOrgAdmin,)
     serializer_class = serializers.LabelSerializer
 
@@ -36,3 +35,7 @@ class LabelViewSet(BulkModelViewSet):
             self.serializer_class = serializers.LabelDistinctSerializer
             self.queryset = self.queryset.values("name").distinct()
         return super().list(request, *args, **kwargs)
+
+    def get_queryset(self):
+        self.queryset = Label.objects.annotate(asset_count=Count("assets"))
+        return self.queryset
diff --git a/apps/assets/models/label.py b/apps/assets/models/label.py
index 41f0f8724..7f1d08fa1 100644
--- a/apps/assets/models/label.py
+++ b/apps/assets/models/label.py
@@ -4,9 +4,10 @@
 import uuid
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+from orgs.mixins import OrgModelMixin
 
 
-class Label(models.Model):
+class Label(OrgModelMixin):
     SYSTEM_CATEGORY = "S"
     USER_CATEGORY = "U"
     CATEGORY_CHOICES = (
diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo
index 903763d9bba7f3375f3f335e30acdc234491726a..da76112fc347e87489519ac854b2c5ef457817c3 100644
GIT binary patch
delta 12952
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
LZQ2iKJ<Rbx2_7ze

delta 12506
zcmYk=3w)0C|HtubC!3j>G3Kyg&ce(v#@Lv{FmjsH96~wfe2C$8$RUv&DoRqa5;-kO
z&MM^;7Re!}kmU4pET{gj_pXn}-}QKWJinjs`TAbhec!89E4;t`*xPd^)b|~SE6Lk&
zies5j$MN!UoXTZX>p0b_InFGM!AZCkfAMmhgc!%!jrn8AsXto7al-KPnvPQfw_|lY
zgY__fEyt;ft*`=4aP>Hu6mn5<2(^J<(I4+v{Ug&m&T;ZlpBveqQv}sN0@<?@j{%s9
z#V`%?;Bc#-h*9J-P~*NpU&rG(KT^<w2QUPWVnMuwf%wq$tIb`IhoCkRg?X_$mcvA>
zh<$Mc&cn9oSI2SMVJCAns@{oroH*8Z+EMVsH&I7454H21SO5>87CMK%cmvh{4hG@B
z7>v2<I!+-BLyfPDs;`ae*Az8Rdu#879^K(!3hFo(bK^|ZfcdBs`3Q^QI@B{hfJN~F
z>d`&H!syF`*22Y6^HxB$$D%eKk2=8ysCC-Z<NPBjbfrQ^Iu3cioLQ)WTdd=5)Eyr{
z-9fgspF=&mKT+?*P1MA9Pzyc5aLkwBwpT#4S2k-UaQ>=Dw2J1am#97Rn4E5?jl73i
zXenx=nW%o7FdBED?(in+&hMf&{2ywZUwzlS*n~U`b;9W$3YxG#YQnLo0aH+SI?M7!
zs7JI6^+?vDUecYYBR_^3cOEs*Usw!pqfR2YfxBQy)T63`x^Yiq3R<W&YJqO3oee^L
ztj3}ym~Ht|)Pn1+ejDnJ51}@261Bk#nDZ!5C-Vd~uXm!m!F)*Wal$ER!m_A=F{lX}
znyIKe>V(?JOQ?lLpiV9W^(lE1^{75V&6kO4-+-#$jT*NXHQx~|pwItF3fkcf%-Jz&
z15dCd1|&H-FKI<ozh<ZjQ&A_^9<_m9sD($P7MOyS@J-7%q27rds7Ln$R%CtWBn3_6
z+t8gj6m=3sP#dX)+IdaX#0jVkG(kPGRI5)%E$}j`|3Fl~5vcjcVM&~cnr9_?)Num^
z?fhHRfIXHUG*6(O-6hmSw^5J6Y2+SpC~BT4RKH57lZwOQSPylwoly(-MxEH8Mx4Li
z#z|D@Wm|;lxC)~&AlY50Hfn>-Q4^=3ChCe>un+3ahoKf4gXM5CdgJHjDvTmuV;)K7
z{HsxMmkKRdwlR}q2TZ}$s1v!5TIdOCBY{mEXEPQ;Up$O{cnmeqDbxn@G<7YAI=Kkc
zoxgzEXaf%gO_+ju)*USGY55@30%K6`#CU6;gWAwy)WVsl@vAWxer@@7)JFEAzPhtf
zpNcD}-wMw^6!a41YvvwJBx>R$EQ_sB3yef9FwUHY0pxF^#xJ(|&&@1zJ8DCFQT+~M
zDLjil`uuxw&ibbE!y;G;^>Wq408B;Qc^c~I`eHfEK)o}cpf<V@wZJJ<|Es8lADQ0G
z-ILCZx}h-i*XO?&1szFg)B>@nx3(!pVjnDlQ_ba=oBTV}qdACrgxRQ*J7e{Kqx#)K
z-N-}Kjrp{2$Aw{_KL152Xh&sHJAMJxu{!Ebl2Jdm9Z+xcQ1r(U7>F6Dg{PxVWC7|V
zGEx0DqBgJ%IdW%@)$c=(24qvv1}>pC@Hc9}ZPY}MP;Yf$OZP2~N1aqN)W<g+wb7B5
zPea|nhp3O+S~J_~@1aiIKb7;>voD<Lz5}tSjkGp9pf=JKbpm}*8}?v%oR4MjThyaC
zi|T*TypDOv?_(bHZRMUw2x<f2tvG)Ts6d6DRSfD#>sp5<Se-l#bw_WY7Wx479li{M
zaHF{!bpwY`^BqH-=vmYsB9~E*<UiDj`FmQscNUK77>mIekJ@nx>T}z{@_|@^d<?4p
zGVFq%p~iW?=$aq3k&>v5mcv-AYwbfY=kq_2LS-7>!3f-qy2Ep*m*o;_p}$afdJDC&
zC#Xk}yN!FN#m#c4Bd=z8eY2U>w?&<JPgjrApF%z=hNJFa3TnZ5m>(Bm2!4Uuz!ucY
z_Y-QN(^h}g>K~vsn5V6~!NRC<l~6Yphk6wCFj=4f4ixkfzK?pFH=!o}8TG7Aqc(QY
zyo1`XcRTlJLs9MJQ5&m;y2Iu;1l!>-{0=o=&Gv440{ZFm--Lp8+!FOxcS4=OB-Bo4
zpkB&lR=>*JU~WcDyc4yNpHT0}anv0<9oz-|Q1b?30SrS=7=?-y^z0j;Hqs6AV}COP
zL&@i$9>p@$k*-Je-;S}k4`0BisJFioKc%t;YFvHPxYno>PEX_f^_C8xLPs{#9E&>Q
zDb{g5<}8ewa6M{6TTmPQ8B5|h)E#?ubl>h=sCgpHDyaSms4u409XbDk6oyk#8fRe6
zA0RlAJfM^NV>1D(l7EUi+F#7as7F?|GcOjVVjY}@dL%ng8~PFT2oK<7JdT^Nvxg6F
zIE9d|?z5|i8c-YcU7vvZ7$%}7Ohz4HOVqROjCut9P|tQG>e*&s7|um~bFM($`A*dM
zY}5&Q&Qd5$;Wp}-1akYDI2_fnJn9H*pe9JRJPq~CUqPMV`=|-mTKjI)#<Ef4&Y*7K
zmiZ6zC^`Rb?i~lB2INC+q!{WBDxx;j05w4?)E%Xvj&vBR|9E^EXIcF%)O?Rn<Ndq4
z8!m)8q2?H<^}AEh%heyX({ZRrG8=X0D^L?{M7?~wPz&xyO>_daz;$bXj5>*2J=~2J
zLCsqO)xQbqW$%KK9tyoF=u<ESb;mPN6D~z<;7e=YhI+=|p-y5Ss$Vv0;`6A9@1Y*u
zQ`E-u^mI2~81-(ILbaDek0y+zpufrDF$L36N1TaTU>B<2VVsJ`QT1J4ayK#nQ@!{U
z;aKW-_TpwRzBm7sL;W_~fm3-tUsK<xuX{p|`f~mys0i-ImjzZeJ7Wa->sTB=F?XOg
zavF8Se^`Fse1dvJzWv=h3`X@YW_c9qgrhBQ+~4DNY)gfXx`#Ckv3$Jcvr!W*HkX;7
znQKr-y3yQ?+TbDc0_G;ahh^|Ttbk=a1NbSVkctg(jd{bYI?$~jjCItG+Q=1*#G9yv
zg9o|qKrz(I8I9_fU?!U_Fo^oLrl*G$2BA)1tmSW5{w`|gnO48f+-B}GkDC`!pPv7r
zP9X4AH;=#|@>;0+MsDtL(kN)By{*Fl%g3NPPPF=YSc-h9<vUR)a1b^Ant8{3h+5EV
zu-hJt0pww*PeCLG>GNNjf)=WV+Ib`N!F1G}_cRBXBh87Zg=b<7oNM{_*1jKgqQ|WM
z64oNWW_jr$tjqdNB?>vu%1ky}Abp*-s15Ey-O*9=JZjtx^Pc(G+I@z){X;Mx{UT5|
zRK<+LoX>v}1uf9b?21}wu;m%3fp1y;B6Eeg0X2SynQdOO_J2?t@EhjN6NdT%D>01o
zS3`Mgh(p~`5^4j@%noKRa|mj|@s`gum!QV4w0xcA+b}Qn-=o&cw)zXh?DPK@6<YAV
zHTVp7Ckiz4qXvdsUIEoV+N_7g$WzRhQ5%_T&P4T}i<)PN<*Pl`VKbJeVW;I+%$t~>
z`unK2KVXDAQ6<y@aTtR2QIDv#)ptfM*wgY?Egxz5WYoN#nG`heeQWp>HE<P%;y2d5
z-`bCvr_Dc5{jZu2Oy7}ieSXv(M_OJLweh-c?r|DgMQf}?LmCF+WUHTzI@$%O&-+@`
zf<L3a5l^8`CTx_u;W$)#bJUG>G+#n(WFTq-8JP3?KZSxm_jAx2GtHG)m3*~%3KPi#
zN4vJb#^kf{70gCWTxX2CfkafEii@$m<u}ZGn557DW2>nDnmeE|YNstxk09OZhoJ6k
zv^mx4-?scc%RfbpTZKBw?dD!<KZ=^?6na#+ViosHZ+^tXsn3VHg9?^Mqxv_qyaQ^X
z!Kl9%CZqZ<LG@d1u0wtGZnJ!k`O8>7|LS<oDz2LkQ4{-*bKi-gsITP4sJA`E?1Fm6
z15uyvQK)fKt^HjrOa7VV2T?z}XHe_<XK?-nC=|@FJ2j(G9co$L$ZT%5!7$o8p-yVB
zIm29LZbr?MjXIgLmS09~{Eo*8PprXzygQ&EYT{C;f$>(KWVW*UuBbcig*us0mQP15
zyx7b%v&@~Sah`(|^s=2pEp!XDvj?aNye7Ey!B~tu%<>qsw%GtRVG}Hkol)Z_Sp6*2
zIv=8L>`Ub2J<c9$IB5-6QAg`D(H&3(HBm*>25OmYt$r|S;~ADuL5-hl`3j6A-+=m_
zID+bb2XpK9|6xvnKME-8&V$Wx)WT7yJBvmQY>0ZBQ&9ceqWYy{BtH9_awfU@zk?dT
z#QLo@x2m0R_VSM=I;;vji8`Y5mOn&I;5ErzpdhMWENbC+vnlF`+naq*^Nd9GpMz6z
zA!=OsWc&P=rJxSgQ4`d`T9|_BI0?0ZIjFDbWvGewqsCn{|2A)<#{FyN;y(s7z5uGe
z9O{cHb_(aOLVc@9G25dy(gSreL(H+}RC5k$1Mi_GUTUr~zd<ehgXO=Om#qHw6pmH{
z{Wupb7>dfHP!mU^?z9&6!`7C6V;(_m@G7eRUDWtTX29!i9%e?F(Pll56;d#PfobMK
z)P&jAeggf-FQZQE8dk;!)?Q|syU`fb2AZSBcSIlTZh0@WKdPT+C<T37CZI1au!cpb
z309zvaJAL%K%K||%P(1e8`Uq*bk|5T2DMPK*#`B8PIu&8@;KA2VZFKC+>gO@{0;SJ
z{={7Pz<i3D*l&hws9D0SjOt&<@<cNgOHtn?r=90No`UXZs&!a`x|5X{f?Kf!9z=b<
zuVWMj&2&E{(O8B271S5hLezZgQ1k3X-N0!qgx9bc`n<sp8tXePDd;7dkJ|AP)SWFy
z{vLJK;UbKh<^HdhEvWXxsQ$mBA6`T~>#J6O1GRyBm<I#ibk`|}8W)Kk?W`;XS<`Hc
z8rT7~P(Q05W%bjnev!Gt++gl7511#gBJ*6fJY=>zf5dE_zZR%Qg-k$gq&eosE@mIp
zjt85g%<&jR{Z!P3-$spJjscj3nrAEOg!Z5w=>g<h-}!yEeg4zuxD)k9O)whcaXM<^
zU8sqUTKgIE2I|xE)bfIFx&6vu5cO5fx~O@Yq2}*u^#eUt@fvEPnU*g#*Ps^OjuH41
zYU0bN3GbjL%r)2TR|xeEl(f7I>g1}T#?>?%TD_;W71GRZW*^i<15q0oV)bM31@cK)
z1y`fq`je;y?wdYuyDx1BYWzynMzYWgc_($b-~W2cFXiM+PHP9^3-UPi<a!?~;}fC+
z(TF?~`EL!UBcbbp^;P)|qS|x0{=_??25<i6Bf3%ip7zgJ-?>2Y6)}^Fm#`f%)dmOA
zc`<os@<LWe>U?VD*_1C*jwN0sJ|TKjSC?`1Dfc4yxaVA5__ql8^Vez*700Nl#(=@t
zhdc^D#|hTipPXjrZ$j4y>epftF^_nSyfqO;C;f)}NBLtSh|r_@lF)UOC_*1Tg*lI^
zJbFIlpTCGmI@d*BWTyn3mSH7g3H9euS5rbSsV;pwy3$sh=#f*yol|~xeMI3K;y!i!
zMmgT7-<MWIjPAz0`2YVT;s0OZ<e}qAA}^uqJ3K*@qWmhcfzXTB+}bHRcPL*WCQ*J9
zn_62ftZd~r$cM$5jy!cIi^wU}V(|jDfz~;d?mtWE=ubq@_8wKWi8JKSt{<#WiS|j<
zud%kR)F)8K&qU7EjC%cF(CtK3Y6e;T3B0N2uj^Ohp_Mn{PGTT+{D(@;RgnodS-Vx`
zaGigDqy8N6h-mj*pG4Yfkn7_)&+20+e^2Q8n>x=J{`r(-Ha;fuu+S(xPTgRvO0H`H
zkwz3E-;WQ77R0mbOZs*rbQQ#V#7WCl*Mst_#Lq+x=J*$X@#0BjP|%f#!`-4&g$|v_
ztCR1w_EXrEJlpbI_zw9J;uB)6)l+mz68(v7gs$?|w%lw(-73mE^(K@f$<KnmROolP
zf_0+kL{ndqyeIJv@eT2W(De%OJLTL&DIynn6Ke}#Tw(H1)ZYxcK6i1xpiellMSb-q
zR;BPZv61o+yn|D)7=!Op?n|5}uSArg?iTrQ$|?8<5lp!|p=&pxU%JxdKM?~cuOW0T
zAb;2T-8MZpXo$^ec7GC8<iEb1!`8u?oG|i=B)<?_t?l8nMm+djSw+3rkFBmAo7NSK
z^@$;F>ip%!*T@Q+tRsfd_y_)E9pcGLP)?(6k@brv??imCU|w_qPfbcS2wgW_oC5TG
zod_WI*r<<bYeo5@^{J25i2Q^f^+SmO%3otXEXT?#urZ<QkxS0MhpgPdo5xp^j{KxK
za~L>-C{KP6b#*6xCi;=*rhYS~Sla+BOtdHN(dQ*Bg8B<Fl=5bLO6Ypu#pz3ZZRSZL
zdQ$hYUZ3A6jJ6I_FpkC@bksG9C}U;imnhH2O+-JUGqIbx(u~p7(E1+0WMVFLMTzNZ
zv}+gjS=KM-^^LW`6|f}nKROO22GS|oI(};|#y+&owY(PPg_IMByH;1q=KGO6l=d@3
z8R9JQBe9PtOY9{)Pi;_345p%v4W^iLRkl3b@(^rbWpUlc*P-0}x%z)7Z?XI}Ok|#x
z_$&P@+L&_s`g;C~AQ^3qXHB*LNn9a9RA=?MDITXBWBGgdfY?F(IQ$RuvS=#hk%X>%
z=2ACxGQC*;6iKR8h<}MXbnIYtHEqy#@<7VPh(lJFLEUZQ70XXk9!5D1R}-IEeR0ZV
zDbFXqBEBX6AHJ*mUrwwdo?YuHEFgLjAJXY6agA~mKD*wsvJduuu6_{Zmn|Pd=Vanf
za&Jze1r{W)g4viKJ*W9+5y@fV+2up$kEpLlgi+Sjgm}TqlPQlRb`cZlvj@i$2Z*VJ
zuIltHO51)Sorok~=QcS<$loBY>gzk5$_6A}gsv`F*cKW~c{~wsZN;hohw?R|q1)YQ
zY;DtUC3U{^IcaUPtj&k~1IoYS25gIE>6go!^N*lny>+~W?P+|G(3RK4DM9^YVjB5n
ztWGqdoP_I$qlB)y__bSf0$D&;ZEL$sc^l>XSd_N5l<Ost<RQGMD2)Ye(07!dUHPo;
z1_RDfxeSjH3n}mO$|@IgH`jtPwSUj@ud~p9LBqt*tb>V3L0Pp^pZaAbx9b>~mDz2!
zUtnC7*qD+rb>d@cXVvT7(SO160SmGc2S)g3jTzoKD9g|DrC-+W*DnQReKqHS@BaY}
Ct*O8O

diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po
index 12310b65f..46cf77ef9 100644
--- a/apps/i18n/zh/LC_MESSAGES/django.po
+++ b/apps/i18n/zh/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-07-31 19:18+0800\n"
+"POT-Creation-Date: 2018-08-03 15:14+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -96,7 +96,7 @@ msgid "Port"
 msgstr "端口"
 
 #: assets/forms/domain.py:15 assets/forms/label.py:13
-#: assets/models/asset.py:225 assets/templates/assets/admin_user_list.html:25
+#: assets/models/asset.py:231 assets/templates/assets/admin_user_list.html:25
 #: assets/templates/assets/domain_detail.html:60
 #: assets/templates/assets/domain_list.html:23
 #: assets/templates/assets/label_list.html:16
@@ -142,6 +142,9 @@ msgstr "资产"
 #: users/templates/users/user_list.html:23
 #: users/templates/users/user_profile.html:51
 #: users/templates/users/user_pubkey_update.html:53
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:52
+#: xpack/plugins/orgs/templates/orgs/org_list.html:12
+#: xpack/templates/orgs/org_list.html:12
 msgid "Name"
 msgstr "名称"
 
@@ -349,6 +352,7 @@ msgstr "创建者"
 #: perms/templates/perms/asset_permission_detail.html:94
 #: terminal/templates/terminal/terminal_detail.html:59 users/models/group.py:17
 #: users/templates/users/user_group_detail.html:63
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:60
 msgid "Date created"
 msgstr "创建日期"
 
@@ -372,6 +376,9 @@ msgstr "创建日期"
 #: users/templates/users/user_group_detail.html:67
 #: users/templates/users/user_group_list.html:14
 #: users/templates/users/user_profile.html:130
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:64
+#: xpack/plugins/orgs/templates/orgs/org_list.html:15
+#: xpack/templates/orgs/org_list.html:14
 msgid "Comment"
 msgstr "备注"
 
@@ -452,6 +459,10 @@ msgstr "默认资产组"
 #: users/models/user.py:33 users/models/user.py:348
 #: users/templates/users/user_group_detail.html:78
 #: users/templates/users/user_group_list.html:13 users/views/user.py:380
+#: xpack/plugins/orgs/forms.py:26
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:113
+#: xpack/plugins/orgs/templates/orgs/org_list.html:14
+#: xpack/templates/orgs/org_list.html:13
 msgid "User"
 msgstr "用户"
 
@@ -787,6 +798,9 @@ msgstr "测试"
 #: users/templates/users/user_list.html:77
 #: users/templates/users/user_profile.html:151
 #: users/templates/users/user_profile.html:180
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:25
+#: xpack/plugins/orgs/templates/orgs/org_list.html:48
+#: xpack/templates/orgs/org_list.html:43
 msgid "Update"
 msgstr "更新"
 
@@ -810,6 +824,9 @@ msgstr "更新"
 #: users/templates/users/user_group_list.html:45
 #: users/templates/users/user_list.html:81
 #: users/templates/users/user_list.html:85
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:29
+#: xpack/plugins/orgs/templates/orgs/org_list.html:50
+#: xpack/templates/orgs/org_list.html:45
 msgid "Delete"
 msgstr "删除"
 
@@ -836,6 +853,8 @@ msgstr "选择节点"
 #: users/templates/users/user_group_list.html:86
 #: users/templates/users/user_list.html:200
 #: users/templates/users/user_profile.html:222
+#: xpack/plugins/orgs/templates/orgs/org_create_update.html:33
+#: xpack/templates/orgs/org_list.html:86
 msgid "Confirm"
 msgstr "确认"
 
@@ -869,6 +888,8 @@ msgstr "比例"
 #: terminal/templates/terminal/terminal_list.html:36
 #: users/templates/users/user_group_list.html:15
 #: users/templates/users/user_list.html:29
+#: xpack/plugins/orgs/templates/orgs/org_list.html:16
+#: xpack/templates/orgs/org_list.html:15
 msgid "Action"
 msgstr "动作"
 
@@ -1021,6 +1042,7 @@ msgstr "存在资产，不能删除"
 #: users/templates/users/user_detail.html:461
 #: users/templates/users/user_group_list.html:81
 #: users/templates/users/user_list.html:195
+#: xpack/templates/orgs/org_list.html:81
 msgid "Are you sure?"
 msgstr "你确认吗?"
 
@@ -1576,7 +1598,7 @@ msgid "Special char not allowed"
 msgstr "不能包含特殊字符"
 
 #: common/views.py:19 common/views.py:45 common/views.py:71 common/views.py:101
-#: common/views.py:129 templates/_nav.html:86
+#: common/views.py:129 templates/_nav.html:98
 msgid "Settings"
 msgstr "系统设置"
 
@@ -1638,6 +1660,7 @@ msgid "Become"
 msgstr "Become"
 
 #: ops/models/adhoc.py:161 users/templates/users/user_group_detail.html:59
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:56
 msgid "Create by"
 msgstr "创建者"
 
@@ -1857,7 +1880,7 @@ msgid "Task run history"
 msgstr "执行历史"
 
 #: perms/forms.py:20 users/forms.py:265 users/forms.py:270 users/forms.py:282
-#: users/forms.py:316
+#: users/forms.py:316 xpack/plugins/orgs/forms.py:30
 msgid "Select users"
 msgstr "选择用户"
 
@@ -1911,6 +1934,8 @@ msgstr "添加资产"
 #: perms/templates/perms/asset_permission_user.html:97
 #: perms/templates/perms/asset_permission_user.html:125
 #: users/templates/users/user_group_detail.html:95
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:93
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:130
 msgid "Add"
 msgstr "添加"
 
@@ -2114,6 +2139,10 @@ msgstr "终端管理"
 msgid "Job Center"
 msgstr "作业中心"
 
+#: templates/_nav.html:86
+msgid "XPack"
+msgstr ""
+
 #: templates/captcha/image.html:3
 msgid "Play CAPTCHA as audio file"
 msgstr "语言播放验证码"
@@ -2738,6 +2767,42 @@ msgstr "再次输入密码"
 msgid "Setting"
 msgstr "设置"
 
+#: users/templates/users/reset_password.html:105
+#: users/templates/users/user_password_update.html:98
+#: users/templates/users/user_update.html:34
+msgid "Very weak"
+msgstr "很弱"
+
+#: users/templates/users/reset_password.html:106
+#: users/templates/users/user_password_update.html:99
+#: users/templates/users/user_update.html:35
+msgid "Weak"
+msgstr "弱"
+
+#: users/templates/users/reset_password.html:107
+#: users/templates/users/user_password_update.html:100
+#: users/templates/users/user_update.html:36
+msgid "Normal"
+msgstr "正常"
+
+#: users/templates/users/reset_password.html:108
+#: users/templates/users/user_password_update.html:101
+#: users/templates/users/user_update.html:37
+msgid "Medium"
+msgstr "一般"
+
+#: users/templates/users/reset_password.html:109
+#: users/templates/users/user_password_update.html:102
+#: users/templates/users/user_update.html:38
+msgid "Strong"
+msgstr "强"
+
+#: users/templates/users/reset_password.html:110
+#: users/templates/users/user_password_update.html:103
+#: users/templates/users/user_update.html:39
+msgid "Very strong"
+msgstr "很强"
+
 #: users/templates/users/user_create.html:4
 #: users/templates/users/user_list.html:16 users/views/user.py:83
 msgid "Create user"
@@ -2837,6 +2902,7 @@ msgid "After unlocking the user, the user can log in normally."
 msgstr "解除用户登录限制后，此用户即可正常登录"
 
 #: users/templates/users/user_group_create_update.html:31
+#: xpack/plugins/orgs/templates/orgs/org_create_update.html:32
 msgid "Cancel"
 msgstr "取消"
 
@@ -2847,27 +2913,33 @@ msgid "User group detail"
 msgstr "用户组详情"
 
 #: users/templates/users/user_group_detail.html:86
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:121
 msgid "Add user"
 msgstr "添加用户"
 
 #: users/templates/users/user_group_list.html:5 users/views/group.py:44
+#: xpack/templates/orgs/org_list.html:5
 msgid "Create user group"
 msgstr "创建用户组"
 
 #: users/templates/users/user_group_list.html:82
+#: xpack/templates/orgs/org_list.html:82
 msgid "This will delete the selected groups !!!"
 msgstr "删除选择组"
 
 #: users/templates/users/user_group_list.html:90
+#: xpack/templates/orgs/org_list.html:90
 msgid "UserGroups Deleted."
 msgstr "用户组删除"
 
 #: users/templates/users/user_group_list.html:91
 #: users/templates/users/user_group_list.html:96
+#: xpack/templates/orgs/org_list.html:91 xpack/templates/orgs/org_list.html:96
 msgid "UserGroups Delete"
 msgstr "用户组删除"
 
 #: users/templates/users/user_group_list.html:95
+#: xpack/templates/orgs/org_list.html:95
 msgid "UserGroup Deleting failed."
 msgstr "用户组删除失败"
 
@@ -2943,30 +3015,6 @@ msgstr "新的公钥已设置成功，请下载对应的私钥"
 msgid "Update user"
 msgstr "更新用户"
 
-#: users/templates/users/user_update.html:34
-msgid "Very weak"
-msgstr "很弱"
-
-#: users/templates/users/user_update.html:35
-msgid "Weak"
-msgstr "弱"
-
-#: users/templates/users/user_update.html:36
-msgid "Normal"
-msgstr "正常"
-
-#: users/templates/users/user_update.html:37
-msgid "Medium"
-msgstr "一般"
-
-#: users/templates/users/user_update.html:38
-msgid "Strong"
-msgstr "强"
-
-#: users/templates/users/user_update.html:39
-msgid "Very strong"
-msgstr "很强"
-
 #: users/utils.py:41
 msgid "Create account successfully"
 msgstr "创建账户成功"
@@ -3218,6 +3266,54 @@ msgstr "MFA 解绑成功"
 msgid "MFA disable success, return login page"
 msgstr "MFA 解绑成功，返回登录页面"
 
+#: xpack/plugins/orgs/forms.py:14
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:76
+#: xpack/plugins/orgs/templates/orgs/org_list.html:13
+msgid "Admin"
+msgstr "管理员"
+
+#: xpack/plugins/orgs/forms.py:18
+msgid "Select admins"
+msgstr "选择管理员"
+
+#: xpack/plugins/orgs/meta.py:7
+msgid "Organization"
+msgstr "组织管理"
+
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:22
+#: xpack/plugins/orgs/views.py:73
+msgid "Org detail"
+msgstr "组织详情"
+
+#: xpack/plugins/orgs/templates/orgs/org_detail.html:84
+msgid "Add admin"
+msgstr "添加管理员"
+
+#: xpack/plugins/orgs/templates/orgs/org_list.html:5
+msgid "Create organization "
+msgstr "创建组织"
+
+#: xpack/plugins/orgs/views.py:24
+msgid "Org"
+msgstr "组织"
+
+#: xpack/plugins/orgs/views.py:25
+msgid "Org list"
+msgstr "组织列表"
+
+#: xpack/plugins/orgs/views.py:40 xpack/plugins/orgs/views.py:56
+#: xpack/plugins/orgs/views.py:72
+msgid "Orgs"
+msgstr "组织"
+
+#: xpack/plugins/orgs/views.py:41
+msgid "Create org"
+msgstr "创建组织"
+
+#: xpack/plugins/orgs/views.py:57
+msgid "Update org"
+msgstr "更新组织"
+
 #~ msgid "* required Must set exact system platform, Windows, Linux ..."
 #~ msgstr "* required 必须准确设置操作系统平台，如Windows, Linux ..."
 
diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js
index 72128fa2b..859d399e8 100644
--- a/apps/static/js/jumpserver.js
+++ b/apps/static/js/jumpserver.js
@@ -224,6 +224,42 @@ function objectDelete(obj, name, url, redirectTo) {
     });
 }
 
+function orgDelete(obj, name, url, redirectTo){
+    function doDelete() {
+        var body = {};
+        var success = function() {
+            if (!redirectTo) {
+                $(obj).parent().parent().remove();
+            } else {
+                window.location.href=redirectTo;
+            }
+        };
+        var fail = function() {
+            swal("错误",  "[ " + name + " ] 组织中存在未删除信息，请删除后重试", "error");
+        };
+        APIUpdateAttr({
+            url: url,
+            body: JSON.stringify(body),
+            method: 'DELETE',
+            success_message: "删除成功",
+            success: success,
+            error: fail
+        });
+    }
+    swal({
+        title: "请先删除组织内的以下信息：",
+        text: "用户列表、用户组、资产列表、网域列表、管理用户、系统用户、标签管理、资产授权规则",
+        type: "warning",
+        showCancelButton: true,
+        cancelButtonText: '取消',
+        confirmButtonColor: "#ed5565",
+        confirmButtonText: '确认',
+        closeOnConfirm: true
+    }, function () {
+        doDelete();
+    });
+}
+
 $.fn.serializeObject = function()
 {
     var o = {};
diff --git a/apps/users/templates/users/user_otp_authentication.html b/apps/users/templates/users/user_otp_authentication.html
index 502707874..8d7101475 100644
--- a/apps/users/templates/users/user_otp_authentication.html
+++ b/apps/users/templates/users/user_otp_authentication.html
@@ -6,7 +6,7 @@
     <div class="verify">
         <p style="margin: 20px auto;"><strong style="color: #000000">账号保护已开启，请根据提示完成以下操作</strong></p>
         <img src="{% static 'img/otp_auth.png' %}" alt="" width="72px" height="117">
-        <p style="margin: 20px auto;">请在手机中打开Google Authenticator应用，输入6为动态码</p>
+        <p style="margin: 20px auto;">请在手机中打开Google Authenticator应用，输入6位动态码</p>
     </div>
 
     <form class="" role="form" method="post" action="">