From c5785e17aaa57bf2442ffb1256f526f58f383d75 Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Fri, 6 Dec 2019 15:29:01 +0800 Subject: [PATCH] Dev node (#3511) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] 添加节点详情Modal * [Update] 更新翻译 --- .../templates/assets/_node_detail_modal.html | 68 +++ apps/assets/templates/assets/asset_list.html | 27 ++ apps/locale/zh/LC_MESSAGES/django.mo | Bin 83853 -> 83900 bytes apps/locale/zh/LC_MESSAGES/django.po | 426 ++++++++++-------- 4 files changed, 322 insertions(+), 199 deletions(-) create mode 100644 apps/assets/templates/assets/_node_detail_modal.html diff --git a/apps/assets/templates/assets/_node_detail_modal.html b/apps/assets/templates/assets/_node_detail_modal.html new file mode 100644 index 000000000..f1f6f2dda --- /dev/null +++ b/apps/assets/templates/assets/_node_detail_modal.html @@ -0,0 +1,68 @@ +{% extends '_modal.html' %} +{% load i18n %} +{% load static %} + +{% block modal_id %}node_detail_modal{% endblock %} + +{% block modal_title %}{% trans "Node detail" %}{% endblock %} + + +{% block modal_body %} +
+
+
+ +
+

+
+
+ +
+
+
+ +
+

+
+
+
+ +
+

+
+
+
+ +
+

+
+
+
+
+ + + +{% endblock %} + +{% block modal_button %} + +{% endblock %} diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index a014cbcb4..66bc18f26 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -127,6 +127,7 @@ {% include 'assets/_asset_update_modal.html' %} {% include 'assets/_asset_import_modal.html' %} {% include 'assets/_asset_list_modal.html' %} +{% include 'assets/_node_detail_modal.html' %} {% endblock %} {% block custom_foot_js %} @@ -198,6 +199,8 @@ function initTree() {
  • +
  • + ` }) } @@ -547,6 +550,30 @@ $(document).ready(function(){ flash_message: false }); +}).on('click', '#menu_node_detail', function(e) { + e.preventDefault(); + var the_url = "{% url 'api-assets:node-detail' pk=DEFAULT_PK %}"; + the_url = the_url.replace("{{ DEFAULT_PK }}", current_node_id); + function drawingNodeDetailModal(data){ + $('#id_node_detail_id_view').html(data['id']); + $('#id_node_detail_name_view').html(data['name']); + $('#id_node_detail_full_name_view').html(data['full_value']); + $('#id_node_detail_key_view').html(data['key']); + $('#node_detail_modal').modal(); + } + function error(data) { + alert(data) + } + function success(data) { + drawingNodeDetailModal(data) + } + requestApi({ + url: the_url, + error: error, + method: 'GET', + success: success, + flash_message: false + }); }) diff --git a/apps/locale/zh/LC_MESSAGES/django.mo b/apps/locale/zh/LC_MESSAGES/django.mo index 8db79ed9c6a55e61ca069a6c1dcb58678317ed97..9be636b53bcc4287f7b1e8bc83b476d49b0a999d 100644 GIT binary patch delta 24297 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Ƣ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 delta 24246 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%0AVf+6c%oC?*R6*XUBOsb#%Rj6pf2ABui zqB>4QO*|KMOV(gRJcLOxa=qKJ7}WR@s0CNWgxD1IcC^B3H~{sKev7)*r%-?J^6pX5 zil1Rd4BX&em&~Yzy+_LT{scctTNe1nP=1qqeXVYKv>59BAZlR`QT?8x9@2nK&Qz!mqMWELt%ADJHmD2fhFa(V)H5{>wa_`J z9b2qFBx=Q*Na!9PL|y3()PP4=2LrxwaXr)m+T&9kfGM!cW_RMDs2v%P$#Ev?0+yoY z{Svh^8&M0~?z6;x)XI-o!+F%i*H9Dw&)VOhb|T3Z_nxOkT|g9SVZ~43n-6SX=sT0XdQ^!!bzx!=b@g7m6!!jpceQ9+hMwGd^y2kSOu?P zHO%%cf1be}_z@=E?tV6Wf-!pkS5VnS!y!zC<96`7JI=?!_zd%6kDdM(!kde0iK{Uv z2R=f5Fs0e;9>zjgfVeJd!6VESs0AOzlK2cu>;2ES$0fR=UW?CB_iQDm#;vG_=ZLkR zL*1gQsAuB_j>U)g9Q*HePj}bv{9EjeKz$T{gO%|d=Et=A*#9C_YEbzAhvR4JfSs`W z_ihJ{Vk~jx{X9sx0(E5xe{g?2&yQ`02V+q@fu%6P0r!xW!wBLkm=;@LB=$SN{_CsI zBoey9&&{>wx2R{}2hD`MN@Hpz$+{5(f9dr|CK#k9XT0l7r$J!W$AE2&$ zBI8!0&36X<|NGw!Dtc<4qn^^-N8Et&sC!-ub)~IQPj4^OPJDuzaE`^xQ2oEb zTDTuWFv%}&fvGSraaN4M2I&9!Kah$Zl2NEDn}s^zTGWE}U}8Lpx)m2u57QG2!W2i{ zPNl($#Q9MDd!rUQ1l4bXISqq}KSQ6kbO9A@$uiUlH=!mtfT4I4lj23x75#|`@e%6T zd4|0(vkwRY6lCV<}ZbMHkx7>cE$)C?4vTC z%4F0n2tDVvIsfJtGZK<6Yva9`oQIm=BZw$*)sb3YG7H z`eHE$bKn-#R$s(ud}i&bZ@GR&@niChu{xf@5baIc+k7aH$cpiJACuu1cifh5Fn3`v z`9r8HJZ|}GmVapRb2IR+8y{w7G;^coDIqz(SDs1;Rzuz624-8-2Tpg3$D#(#L@i)0 z>S0=K?K{ka$kuwNEWTqtHv{jvabf8H-~TdOBA;0fwUBydYt)ImntjZ{=12^oeH?1s zbaNqUp)1Xu*p2uos(-Qj?0+^Y74Ew)6rHdo@pSBnH?bmC|I0bSJZJ_zaGw*^Q492; zCZ1^Vriyh?x}u-WbLI{6G3vx`Q2i4= za?eg$R6d89-z4wB}_uTJ|@OisMj&p9EMuh3=Gx# zKZlC8Zn?Qm4aD0p9DhLF!?PAYv^e0ITS$7;_$V`%S;Q=7)7-4_31?H4TnJL;A`dN*O>mu~A)qfV6B z%whTbsD+iZd^Jo%T-V|ct-Xgi)biu8Ed8ch{1fUzkD=ZY-yfEEi#kF0KdwV&vj{3* z-Qp&wTh;}&wf#`fzyxbwj_SYF+;1MY_DdE&bo#u1ts(I%H!uTgg}E#)i)o2#nX%SB z!rEt;i_BH11#LA?qHe`s7QaSaK-z!x`vmttD;0IfgK8*aaW&MHG_!mxCME7=`C+JW zpO|yZuTZyeD{B01^RRi=ypG{|{~xJ>fv=sZQ3G?KuDrO#4a~M?chrf7SUk$&DVU7> zr>F&fZuyO3g31E`%miG}cn z#i_gif1DF_fvwCAp3fz^l1NEIAJmTcP!lajEnq9^Gk-s7f`ga>kD{KLE0({F>i^K< ze=QCSaQ(u}bf|tYKC2W$OH?;s#x1e@O4NxqSiH;P z{iuGv<5sy~9j=>q&Bv&R@P)-G0^Nj>W;WDEa$(eGerwB*F{hz!-2#hOqb_uti+$c6 zDmuZ>s4c(l8ocLbU;>v9Lk-M|nJ_nMTun@m9j$#N<{=)3{wqiQINoLL2Q7aTGwA)l zNF|C6&#fUEnS2f_m#QM@>@_lvB&a9F$w4Q zPE*kYS5bf6dSSl8b^OO-FT{0BhPsmUW)>_)oXg^Ns877ksEG%fK65&1{6f?PFGJnR_z>Rz z7%FG2<3H9hIEm|+45!f^jV*9J>T@7LQuk0LGQ&}?UnbOv3ZfQL!mNrqaU;}@cC!3v zpEXRi#8T9=uogAZ0gI1V`wh!KMm=mVQ1>z*)R_`>YqFRnQ75jCnzy4l-15HJRJ78s zQ4?-4_n;Q=lX(o)?~Hj3HSt6AFCdv~Pl@`4CCcKOsCk>Az74mxd^e}h8%#wLjkSh3 z=5lkRxf}J7d)T~a`Fp7GFHrA&lH~3d6-V_iZPr08q%G=M>4GKn{tvQ-wWtAGF*_c# z_&(~2UZZv(dsu+~cfBI09jam0N3}PzIM(crT3|nOoH-Z6^!~3_1$S7(Vbndmgt})> z%p@sX9AlP4ov=CT1Rq*F#2klO;4IWf^gPrKd}kg;pAx4maT)b=-$G4%5B0(F0`=Km zCZ)@FK%KBRYT-WALT8~qNmpBZ2-WWo)Iy%3F6P5$AzeSyVBx)sQyPSzKlBI zT{9?+yTUAHF4Q~)&2naK*Y5LLSfU;3N_$#7+MJ47*nDf>VEOM+58E-+g8xD-EP13m zVHD~$&Wqae#%3$jt?b~J_pgT~2AQK#E1rZ}&>YkRt56T+M$7L*|J#G=e;M@&ch~a& zv;1q+LPOHJez{Qd6-WQ~|8i7Xk!XnepjnMs@mJIdo}o_gpP4kBn;^)?tmy{U;E($n&=mDUq$_GcpP?SUwWx`{N1f=9dB)nW#r;|)!lxdoGP#}^ zP^ZjlaX!=;idw#g5YhCl)t0+nQZa7uFB;y?dy|b5Q47Y_5*tvs8&~B(%aGtl_N1*UjgaPn_8; zBsJ;;*-_*3S-!Nzwapf0C)B;^Z}Ak=`R4hoVGULz@q=|p6zxuw3Uz{P78gdHxH4+O zTG$<9Ek0u2K#hBi+Od!BOv%86EpmwII#qCfh>}l};bBsC7Tws1} zZZY?v|FiTc6>Z%`)UCLKn)oH^3f^Ky49(%<+-3>0s@VuNuARl5%>k$%cVn!58S00| zsvNxk`l)e}gnWwHsx&#B1yLuig<41#)RqrKEqDUz_vksOA9I_m{d?32PFwypW+qOS z%Y9boM_p*WTs}AP2P8D02Wla+E#8JTh_7O4%$_^I|F1+kU`yf!I1e9NJSmS``0wUR zRC~(2Zh@;&AL2Vvf4zF_qoS>e$`|0x#!5H{Pout~)XeX$xRW^)wL?=Z{t|U1+b|6t z#9DY6t7G;8?t64E)Uy+Z+R3G;o%F4>#9s3V>K>lA_$u}zzK;j7Z9#WSvJ`TEo~nTP z$oE6-)DkR?H?TRTD;(gJS37DaHefTXRwO|G=kPvnA(hr7USk_Piw85Agr*wx7JD}+zIQU|8+Inp~iKy_7TeK{U2)$(@@_eK1bct zz2-60%CDd%xM%SjYfnY&E;Kz-s3MLko~(SHHxfB$z=QOCpPS=3u_ z-Qu89u07n$Z018vRNCTt7Pm${q`fUa!Q$E0zRvRBmE!%^Q~Qf0uA7fgJMh}#(9&)J z=}=pm!z_fAh|8ev@knfn<4_AbXZgG4W7LJdu=a#yc>i^x$TIGGa8A?-3Zb5bGN=!h zN;n1^V<|johLm*^Rxul*=KBD(fZkXJeHQOR&3_El@4OmRxsAF*IID{P5UW<|3GYUTB@H?~7PR7X$? zy@A8=Z`51VzoJ{nW7NW)p%(NX*2Sci+=*LaA>#I!T_a~v$xC7z>I3K+eum{L2Y83@ zIJU!iRoqAGGb~43zN$On2-Ise26YP-p%!@9@|P@rf!e7g)!f38qyOJhWT28JfUn(H zkq)J+yN}4>r~$`O3p<6nvivoiB~d4;Y&Jt(aW~Y?4aNod32I!Xnyx)3DlUdTouC30 z-IFTTp*HFl?G~tsdZJD=0$Hd3Q|=P(3FJQ<15DM+G2s|Z%8@Q1pQ6YQLI2T%I4Pw# z5s!!0Q-7*C%;2Lo!AJ(KrTpjm`~Ta=Ci{YDB!hk?j>5~tY=~DOZbQvT-(qSz$Rx)+ z?=9!`dv*VG{HGN&T%rWiR@9PJiB~iBvGreuKM?Ci@1yNs)I;!vwKt>ff7Hj)wom^? zZU(_;*7zTdI%b-;$miv{H<7Cq7`M4*1dp8;N#+91qBSA){nTGlKZ&Cm8BT5`@qe5` z$A{#C$<4A^Q&B%mJ(;zu&ola8pahf4jt43FxOjK;AYYOo_YNBVv5C~!#OhzzWKU_Y z!3k<>wW(8E>mynRQqM?B#<<3{BYbm-HqiGQO5=BD!M60sK^aH;D@Hw~OntBYt`p}m|3L8`kN6>hV#&MK6)L-FB zT!=bSFllM)?=t)~l{xnUlA5j01b(CV(zSM8f{~o0sxqY_2 z(zNxXevSMT`smRAhVkxbN_!jq67`Twae{mJ6O+d=;6IyWA+e6<hCY0pFI*!nXFAv@@;$xJ1^!4J#){F2hCgQ8A zcS9LFMv_ZP+zWN+FWRH1`zYVgcRy~yPboV362Gx}Vwds~G5&Y*>51Fm3Co|L-+k(l zwAbOH{ptF4iO=a+k%n$$`Ax!$p=>6nqblyAtpW9H^sk3UtSz2;Qddh%H>30ovl*3s1UbnF~sp}tG&c`d(NBv&B zS8qoB89Dv%+p3p6Jp(FOhh>_;j!R6+4^MA}O|EoiN(6m+Q<_uHqIT@a9IKflKl$?1 z%TWqae@gou)DcH%Ono~2Zc)EWeYL(Tv?QUgQSTp%82Eq^z(jF$EKK9C^!tol1m(JQ zPDcAW;&;bw>O%=my_fsa7Eq5|R{HDU7bdSO^(sCpjV+m#hBf|Xt_(lngl8x(=%eEw zhnJfE`o;D`+Hz2q*a-?_McQ`I{|D-wDbpyADLOjPca+s#hW&qFi2!pAoz^fx6ehD? z-_n+tI2HM|coef!a*_Xu_&oKilnizuzca2sc^$XuV^g~X|9wT%k8;fno>u5qgh@#^-^1G@3=wsvC;VyECY0E|Zf7Bl_{vmMzER9tX zaQ=k^_X+CK;cMzYFwGe^m;b+0$oHUBVv=o^??(S_#Dj_VQ*X?;XxvCyNZ%H?inctI z>(q5rAkWuMuRG)P-E=Z#fbRdt6dlFrsNe4&Fj)s|L_UPvYw8PZl3V1WiK{ZnQT&RS zKR0;aQ~spS2y)FRwWxPwo=@;HzB~B!(tiYF658}&`;U(a647x3Q5CF7IY=&&j%z9H zi9e>TWZdS)k-pE#d{1jCvcHkNL3ww?vNRo^(>{&%ob)|L{d001DW@qqz9yfa_HC4k zlz94-A$Jm&6VIm}L%-XUgyf1b?{M-Q{A(=|OR4df3;$7rh9lIrl5a<@6ZIJC+bDcT z_y3ilAN4cTC(_p2KZ->$t`Frt`Fr>&MZXlDC7w?IE7Wsy;;*T<#txM6`r-5~9d&$% zCur0WVYyDkEtueEV*SQhh`2tbHo1EE1bZ@3TH3y&uHz!*0R8jQo{@5w`rjBxzYX-c zO+1@E-;v9#r=~g$ckvG8IE`&J3&(EiIx5gUjL!VJ?eUAE|CqpkCzBh6|KJmfj(m*C zO#e*8XNlkXv%JK3+QxomeY?}QdIJ9Qg*9}=x5U3#{D%5+tCzPyOUU)&1PRG+r_7_= zhzn^JqkkFUC7?8<#|nB+r=Ed&bxIdo#(r`-_Tgmm)37Lgv#JmEiMWgQ7L<$B_4`d2 z?TK(TRwnlWXP-phhQ#lVlYw4V{-qM%z}`zvrL&Hg;c)PbWHWxmZ3 zWJdT~{@;IoWF<2ha{=pdp`nzy3HbgHMdjU**#>*>q~QnZ^%?XB^(##9f>M*B|1Ye^ z$Zw@R2)hs`qrQ!LFWPl{5EsxQvh`DHll(D1l4*HEJ)gzPi5oI<0wWtTQpX-jfAXg& z-;!&OIu7Fu97L`bV}6Yr&?1BHf7ZI3mM~gs6aUFRyWItQa*2F<9vo-_1w%j%R zk^bpyOkK=P`IM4{egm*QW6IDk4W%dLCrU}$GSgO&wj#`%pHhH)o`ihPd_zMqI?Sc$ zh@zAr*N09z>XNUBA2RqRxfmRU>i!Y`d5(+e|L%B3y*K$BBtk9U)Edi@zh$}N%<-|0 z#CJ5-(*P1bQSMMrNzt*>I+x(2$*rD}KL61ECB8cb5nr?RH|B2hmGvt~pVO2E%=PZz z`gyBK>X>K)f?enZ5;wNN2k{C04p^V}=J5AkZ*#n+-&!(f=vNoRiDyuHQFI)#@vWF( zoc_N8kD+0R4epFJ=+uvLl`@c0+s;%C`w-`|co6mVj9qCHX2-I$Eg(OZe9m`sl50gA zN4%J}0~8$_=s!;1PS)52b#3A;bWBa|5ay6k^? zMSX$AzYrIoJ%l(LE})#SwjpsrZNhvxIrBNPv&k;Q->kJfZla_k_ZPGLNSVM{pHsS$ z|CiFnR&f*?(61k5lI4b}PM<}Tn-m?z$mys2W70?x zOPC-5_3}1A{H;QtLgbfGuSR_p<=xT9>Yp&SvLz4UQsPF8iKo3NZsx?ft-TU$v;7O< z$66YK7Ib+32xHJ+(3XO^#*r|JT z-+s|u`VJmAJi1Tp;7;AUbdK)PH@e@D=#iu2XRaNRFHzCx!iCEeD;}TZ{GO=z-=DV% z4!*T@_nqzI{MM2w Ze@@?dcfyQYOPAkXym34Kp5#@o{{tngYUls} diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 06a0c7222..a76bd68e3 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/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: 2019-12-03 11:45+0800\n" +"POT-Creation-Date: 2019-12-06 15:21+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -78,20 +78,20 @@ msgstr "运行参数" #: assets/forms/domain.py:15 assets/forms/label.py:13 #: assets/models/asset.py:295 assets/models/authbook.py:24 #: assets/models/gathered_user.py:14 assets/serializers/admin_user.py:32 -#: assets/serializers/asset_user.py:82 assets/serializers/system_user.py:37 +#: assets/serializers/asset_user.py:82 assets/serializers/system_user.py:45 #: assets/templates/assets/admin_user_list.html:44 #: assets/templates/assets/domain_detail.html:55 #: assets/templates/assets/domain_list.html:22 #: assets/templates/assets/label_list.html:16 #: assets/templates/assets/system_user_list.html:49 audits/models.py:20 -#: audits/templates/audits/ftp_log_list.html:42 -#: audits/templates/audits/ftp_log_list.html:72 +#: audits/templates/audits/ftp_log_list.html:45 +#: audits/templates/audits/ftp_log_list.html:75 #: perms/forms/asset_permission.py:84 perms/models/asset_permission.py:80 #: perms/templates/perms/asset_permission_asset.html:53 #: perms/templates/perms/asset_permission_create_update.html:43 #: perms/templates/perms/asset_permission_list.html:50 #: perms/templates/perms/asset_permission_list.html:107 -#: terminal/backends/command/models.py:13 terminal/models.py:160 +#: terminal/backends/command/models.py:13 terminal/models.py:177 #: terminal/templates/terminal/command_list.html:30 #: terminal/templates/terminal/command_list.html:66 #: terminal/templates/terminal/session_list.html:26 @@ -119,6 +119,7 @@ msgstr "资产" #: assets/forms/user.py:95 assets/models/base.py:28 assets/models/cluster.py:18 #: assets/models/cmd_filter.py:21 assets/models/domain.py:20 #: assets/models/group.py:20 assets/models/label.py:18 +#: assets/templates/assets/_node_detail_modal.html:27 #: assets/templates/assets/admin_user_detail.html:51 #: assets/templates/assets/admin_user_list.html:42 #: assets/templates/assets/cmd_filter_detail.html:56 @@ -139,13 +140,13 @@ msgstr "资产" #: perms/templates/perms/remote_app_permission_list.html:14 #: perms/templates/perms/remote_app_permission_remote_app.html:49 #: perms/templates/perms/remote_app_permission_user.html:49 -#: settings/models.py:14 +#: settings/models.py:28 #: settings/templates/settings/_ldap_list_users_modal.html:32 -#: terminal/models.py:26 terminal/models.py:263 terminal/models.py:295 -#: terminal/models.py:332 terminal/templates/terminal/base_storage_list.html:32 +#: terminal/models.py:26 terminal/models.py:281 terminal/models.py:313 +#: terminal/models.py:350 terminal/templates/terminal/base_storage_list.html:32 #: terminal/templates/terminal/terminal_detail.html:43 #: terminal/templates/terminal/terminal_list.html:30 users/forms.py:162 -#: users/models/group.py:14 users/models/user.py:429 +#: users/models/group.py:14 users/models/user.py:433 #: users/templates/users/_select_user_modal.html:13 #: users/templates/users/user_asset_permission.html:54 #: users/templates/users/user_asset_permission.html:174 @@ -201,7 +202,7 @@ msgstr "参数" #: orgs/models.py:16 perms/models/base.py:54 #: perms/templates/perms/asset_permission_detail.html:93 #: perms/templates/perms/remote_app_permission_detail.html:85 -#: users/models/user.py:470 users/serializers/group.py:32 +#: users/models/user.py:474 users/serializers/group.py:32 #: users/templates/users/user_detail.html:112 #: xpack/plugins/change_auth_plan/models.py:109 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113 @@ -261,11 +262,11 @@ msgstr "创建日期" #: orgs/models.py:18 perms/models/base.py:56 #: perms/templates/perms/asset_permission_detail.html:97 #: perms/templates/perms/remote_app_permission_detail.html:89 -#: settings/models.py:19 terminal/models.py:36 terminal/models.py:302 -#: terminal/models.py:339 terminal/templates/terminal/base_storage_list.html:34 +#: settings/models.py:33 terminal/models.py:36 terminal/models.py:320 +#: terminal/models.py:357 terminal/templates/terminal/base_storage_list.html:34 #: terminal/templates/terminal/terminal_detail.html:63 #: tickets/templates/tickets/ticket_detail.html:104 users/models/group.py:15 -#: users/models/user.py:462 users/templates/users/user_detail.html:130 +#: users/models/user.py:466 users/templates/users/user_detail.html:130 #: users/templates/users/user_group_detail.html:62 #: users/templates/users/user_group_list.html:37 #: users/templates/users/user_profile.html:138 @@ -377,7 +378,7 @@ msgstr "提交" #: assets/templates/assets/cmd_filter_rule_list.html:14 #: assets/templates/assets/domain_detail.html:13 #: assets/templates/assets/domain_gateway_list.html:15 -#: assets/templates/assets/system_user_assets.html:14 +#: assets/templates/assets/system_user_assets.html:22 #: assets/templates/assets/system_user_detail.html:13 #: ops/templates/ops/adhoc_history.html:128 #: ops/templates/ops/task_adhoc.html:114 @@ -404,7 +405,7 @@ msgstr "详情" #: assets/templates/assets/admin_user_list.html:72 #: assets/templates/assets/asset_detail.html:24 #: assets/templates/assets/asset_list.html:78 -#: assets/templates/assets/asset_list.html:167 +#: assets/templates/assets/asset_list.html:168 #: assets/templates/assets/cmd_filter_detail.html:24 #: assets/templates/assets/cmd_filter_list.html:56 #: assets/templates/assets/cmd_filter_rule_list.html:81 @@ -452,7 +453,7 @@ msgstr "更新" #: assets/templates/assets/admin_user_detail.html:23 #: assets/templates/assets/admin_user_list.html:73 #: assets/templates/assets/asset_detail.html:28 -#: assets/templates/assets/asset_list.html:168 +#: assets/templates/assets/asset_list.html:169 #: assets/templates/assets/cmd_filter_detail.html:28 #: assets/templates/assets/cmd_filter_list.html:57 #: assets/templates/assets/cmd_filter_rule_list.html:82 @@ -535,7 +536,7 @@ msgstr "创建远程应用" #: terminal/templates/terminal/base_storage_list.html:35 #: terminal/templates/terminal/session_list.html:34 #: terminal/templates/terminal/terminal_list.html:37 -#: tickets/templates/tickets/ticket_list.html:105 +#: tickets/templates/tickets/ticket_list.html:108 #: users/templates/users/_granted_assets.html:34 #: users/templates/users/user_asset_permission.html:61 #: users/templates/users/user_asset_permission.html:99 @@ -612,7 +613,7 @@ msgstr "端口" #: assets/forms/asset.py:56 assets/models/asset.py:145 #: assets/models/user.py:110 assets/templates/assets/asset_detail.html:186 #: assets/templates/assets/asset_detail.html:194 -#: assets/templates/assets/system_user_assets.html:79 +#: assets/templates/assets/system_user_assets.html:87 #: perms/models/asset_permission.py:81 #: xpack/plugins/change_auth_plan/models.py:75 #: xpack/plugins/gathered_user/models.py:31 @@ -647,7 +648,7 @@ msgstr "网域" #: assets/forms/asset.py:69 assets/forms/asset.py:103 assets/forms/asset.py:116 #: assets/forms/asset.py:152 assets/models/node.py:462 -#: assets/serializers/system_user.py:36 +#: assets/serializers/system_user.py:44 #: assets/templates/assets/asset_create.html:42 #: perms/forms/asset_permission.py:87 perms/forms/asset_permission.py:94 #: perms/templates/perms/asset_permission_list.html:51 @@ -718,7 +719,7 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC" #: ops/models/adhoc.py:189 perms/templates/perms/asset_permission_list.html:205 #: perms/templates/perms/remote_app_permission_user.html:50 #: settings/templates/settings/_ldap_list_users_modal.html:31 users/forms.py:14 -#: users/forms.py:161 users/models/user.py:427 +#: users/forms.py:161 users/models/user.py:431 #: users/templates/users/_select_user_modal.html:14 #: users/templates/users/user_detail.html:68 #: users/templates/users/user_list.html:36 @@ -759,7 +760,7 @@ msgstr "密码" #: assets/forms/user.py:30 assets/serializers/asset_user.py:71 #: assets/templates/assets/_asset_user_auth_update_modal.html:27 -#: users/models/user.py:456 +#: users/models/user.py:460 msgid "Private key" msgstr "ssh私钥" @@ -974,7 +975,7 @@ msgstr "带宽" msgid "Contact" msgstr "联系人" -#: assets/models/cluster.py:22 users/models/user.py:448 +#: assets/models/cluster.py:22 users/models/user.py:452 #: users/templates/users/user_detail.html:77 msgid "Phone" msgstr "手机" @@ -1000,7 +1001,7 @@ msgid "Default" msgstr "默认" #: assets/models/cluster.py:36 assets/models/label.py:14 -#: users/models/user.py:568 +#: users/models/user.py:575 msgid "System" msgstr "系统" @@ -1029,7 +1030,7 @@ msgid "Regex" msgstr "正则表达式" #: assets/models/cmd_filter.py:40 ops/models/command.py:22 -#: ops/templates/ops/command_execution_list.html:62 terminal/models.py:166 +#: ops/templates/ops/command_execution_list.html:67 terminal/models.py:185 #: terminal/templates/terminal/command_list.html:28 #: terminal/templates/terminal/command_list.html:68 #: terminal/templates/terminal/session_detail.html:48 @@ -1053,7 +1054,7 @@ msgstr "过滤器" #: assets/templates/assets/cmd_filter_rule_list.html:53 #: audits/templates/audits/login_log_list.html:58 #: perms/templates/perms/remote_app_permission_remote_app.html:50 -#: terminal/models.py:297 terminal/models.py:334 +#: terminal/models.py:315 terminal/models.py:352 #: terminal/templates/terminal/base_storage_list.html:33 #: tickets/models/ticket.py:43 tickets/templates/tickets/ticket_detail.html:33 #: tickets/templates/tickets/ticket_list.html:35 @@ -1118,14 +1119,14 @@ msgid "Default asset group" msgstr "默认资产组" #: assets/models/label.py:15 audits/models.py:18 audits/models.py:38 -#: audits/models.py:51 audits/templates/audits/ftp_log_list.html:34 -#: audits/templates/audits/ftp_log_list.html:71 +#: audits/models.py:51 audits/templates/audits/ftp_log_list.html:37 +#: audits/templates/audits/ftp_log_list.html:74 #: audits/templates/audits/operate_log_list.html:37 #: audits/templates/audits/operate_log_list.html:70 #: audits/templates/audits/password_change_log_list.html:37 #: audits/templates/audits/password_change_log_list.html:54 -#: authentication/models.py:43 ops/templates/ops/command_execution_list.html:36 -#: ops/templates/ops/command_execution_list.html:61 +#: authentication/models.py:43 ops/templates/ops/command_execution_list.html:41 +#: ops/templates/ops/command_execution_list.html:66 #: perms/forms/asset_permission.py:78 perms/forms/remote_app_permission.py:34 #: perms/models/base.py:49 #: perms/templates/perms/asset_permission_create_update.html:39 @@ -1134,14 +1135,14 @@ msgstr "默认资产组" #: perms/templates/perms/remote_app_permission_create_update.html:41 #: perms/templates/perms/remote_app_permission_list.html:15 #: templates/index.html:87 terminal/backends/command/models.py:12 -#: terminal/models.py:159 terminal/templates/terminal/command_list.html:29 +#: terminal/models.py:175 terminal/templates/terminal/command_list.html:29 #: terminal/templates/terminal/command_list.html:65 #: terminal/templates/terminal/session_list.html:25 #: terminal/templates/terminal/session_list.html:69 tickets/models/ticket.py:33 #: tickets/models/ticket.py:128 tickets/templates/tickets/ticket_detail.html:32 #: tickets/templates/tickets/ticket_list.html:34 -#: tickets/templates/tickets/ticket_list.html:100 users/forms.py:339 -#: users/models/user.py:148 users/models/user.py:164 users/models/user.py:556 +#: tickets/templates/tickets/ticket_list.html:103 users/forms.py:339 +#: users/models/user.py:148 users/models/user.py:164 users/models/user.py:563 #: users/serializers/group.py:21 #: users/templates/users/user_asset_permission.html:55 #: users/templates/users/user_asset_permission.html:84 @@ -1154,7 +1155,7 @@ msgid "User" msgstr "用户" #: assets/models/label.py:19 assets/models/node.py:453 -#: assets/templates/assets/label_list.html:15 settings/models.py:15 +#: assets/templates/assets/label_list.html:15 settings/models.py:29 msgid "Value" msgstr "值" @@ -1178,7 +1179,7 @@ msgstr "空" msgid "favorite" msgstr "收藏夹" -#: assets/models/node.py:452 +#: assets/models/node.py:452 assets/templates/assets/_node_detail_modal.html:39 msgid "Key" msgstr "键" @@ -1192,7 +1193,7 @@ msgstr "手动登录" #: assets/models/user.py:111 #: assets/templates/assets/_asset_group_bulk_update_modal.html:11 -#: assets/templates/assets/system_user_assets.html:18 +#: assets/templates/assets/system_user_assets.html:26 #: assets/templates/assets/system_user_detail.html:17 #: assets/views/admin_user.py:30 assets/views/admin_user.py:49 #: assets/views/admin_user.py:67 assets/views/admin_user.py:84 @@ -1233,8 +1234,8 @@ msgid "Login mode" msgstr "登录模式" #: assets/models/user.py:166 assets/templates/assets/user_asset_list.html:79 -#: audits/models.py:21 audits/templates/audits/ftp_log_list.html:50 -#: audits/templates/audits/ftp_log_list.html:73 +#: audits/models.py:21 audits/templates/audits/ftp_log_list.html:53 +#: audits/templates/audits/ftp_log_list.html:76 #: perms/forms/asset_permission.py:90 perms/forms/remote_app_permission.py:43 #: perms/models/asset_permission.py:82 perms/models/remote_app_permission.py:16 #: perms/templates/perms/asset_permission_asset.html:124 @@ -1244,7 +1245,7 @@ msgstr "登录模式" #: perms/templates/perms/remote_app_permission_detail.html:126 #: perms/templates/perms/remote_app_permission_list.html:18 #: templates/_nav.html:45 terminal/backends/command/models.py:14 -#: terminal/models.py:161 terminal/templates/terminal/command_list.html:31 +#: terminal/models.py:179 terminal/templates/terminal/command_list.html:31 #: terminal/templates/terminal/command_list.html:67 #: terminal/templates/terminal/session_list.html:27 #: terminal/templates/terminal/session_list.html:71 @@ -1302,7 +1303,7 @@ msgid "Backend" msgstr "后端" #: assets/serializers/asset_user.py:67 users/forms.py:282 -#: users/models/user.py:459 users/templates/users/first_login.html:42 +#: users/models/user.py:463 users/templates/users/first_login.html:42 #: users/templates/users/user_password_update.html:49 #: users/templates/users/user_profile.html:69 #: users/templates/users/user_profile_update.html:46 @@ -1327,15 +1328,15 @@ msgstr "值" msgid "The same level node name cannot be the same" msgstr "同级别节点名字不能重复" -#: assets/serializers/system_user.py:38 +#: assets/serializers/system_user.py:46 msgid "Login mode display" msgstr "登录模式显示" -#: assets/serializers/system_user.py:82 +#: assets/serializers/system_user.py:90 msgid "* Automatic login mode must fill in the username." msgstr "自动登录模式，必须填写用户名" -#: assets/serializers/system_user.py:93 +#: assets/serializers/system_user.py:101 msgid "Password or private key required" msgstr "密码或密钥密码需要一个" @@ -1497,8 +1498,8 @@ msgstr "请输入密码" #: assets/templates/assets/_asset_user_auth_update_modal.html:68 #: assets/templates/assets/asset_detail.html:300 #: users/templates/users/user_asset_permission.html:193 -#: users/templates/users/user_detail.html:368 -#: users/templates/users/user_detail.html:395 +#: users/templates/users/user_detail.html:373 +#: users/templates/users/user_detail.html:400 #: xpack/plugins/interface/views.py:35 msgid "Update successfully!" msgstr "更新成功" @@ -1508,6 +1509,7 @@ msgid "Asset user auth" msgstr "资产用户信息" #: assets/templates/assets/_asset_user_auth_view_modal.html:54 +#: assets/templates/assets/_node_detail_modal.html:56 #: authentication/templates/authentication/login_wait_confirm.html:114 msgid "Copy success" msgstr "复制成功" @@ -1517,6 +1519,7 @@ msgid "Get auth info error" msgstr "获取认证信息错误" #: assets/templates/assets/_asset_user_auth_view_modal.html:97 +#: assets/templates/assets/_node_detail_modal.html:67 #: assets/templates/assets/_user_asset_detail_modal.html:23 #: authentication/templates/authentication/_access_key_modal.html:142 #: authentication/templates/authentication/_mfa_confirm_modal.html:53 @@ -1537,7 +1540,7 @@ msgid "Datetime" msgstr "日期" #: assets/templates/assets/_asset_user_list.html:41 -#: assets/templates/assets/asset_list.html:137 +#: assets/templates/assets/asset_list.html:138 msgid "Test datetime: " msgstr "测试日期: " @@ -1549,14 +1552,14 @@ msgstr "查看" #: assets/templates/assets/admin_user_assets.html:56 #: assets/templates/assets/asset_asset_user_list.html:57 #: assets/templates/assets/asset_detail.html:174 -#: assets/templates/assets/system_user_assets.html:59 +#: assets/templates/assets/system_user_assets.html:67 #: assets/templates/assets/system_user_detail.html:146 #: terminal/templates/terminal/base_storage_list.html:73 msgid "Test" msgstr "测试" #: assets/templates/assets/_asset_user_list.html:77 -#: assets/templates/assets/system_user_assets.html:68 +#: assets/templates/assets/system_user_assets.html:76 #: assets/templates/assets/system_user_detail.html:137 msgid "Push" msgstr "推送" @@ -1573,6 +1576,27 @@ msgstr "SSH端口" msgid "If use nat, set the ssh real port" msgstr "如果使用了nat端口映射，请设置为ssh真实监听的端口" +#: assets/templates/assets/_node_detail_modal.html:11 +#: assets/templates/assets/asset_list.html:203 +msgid "Node detail" +msgstr "节点详情" + +#: assets/templates/assets/_node_detail_modal.html:18 +#: audits/templates/audits/login_log_list.html:56 +#: authentication/templates/authentication/_access_key_modal.html:30 +#: ops/templates/ops/adhoc_detail.html:47 +#: ops/templates/ops/adhoc_history_detail.html:47 +#: ops/templates/ops/task_detail.html:54 +#: terminal/templates/terminal/session_list.html:24 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:64 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:60 +msgid "ID" +msgstr "ID" + +#: assets/templates/assets/_node_detail_modal.html:33 +msgid "Full name" +msgstr "全名" + #: assets/templates/assets/_node_tree.html:49 msgid "Add node" msgstr "新建节点" @@ -1662,7 +1686,7 @@ msgid "Asset list of " msgstr "资产列表" #: assets/templates/assets/admin_user_assets.html:47 -#: assets/templates/assets/system_user_assets.html:50 +#: assets/templates/assets/system_user_assets.html:58 #: assets/templates/assets/system_user_detail.html:111 #: perms/templates/perms/asset_permission_detail.html:109 #: perms/templates/perms/remote_app_permission_detail.html:101 @@ -1689,18 +1713,18 @@ msgstr "选择节点" #: assets/templates/assets/admin_user_detail.html:95 #: assets/templates/assets/asset_detail.html:200 -#: assets/templates/assets/asset_list.html:424 +#: assets/templates/assets/asset_list.html:427 #: assets/templates/assets/cmd_filter_detail.html:101 -#: assets/templates/assets/system_user_assets.html:93 +#: assets/templates/assets/system_user_assets.html:101 #: assets/templates/assets/system_user_detail.html:177 #: assets/templates/assets/system_user_list.html:133 #: authentication/templates/authentication/_mfa_confirm_modal.html:20 #: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:112 -#: users/templates/users/user_detail.html:273 -#: users/templates/users/user_detail.html:449 -#: users/templates/users/user_detail.html:475 -#: users/templates/users/user_detail.html:498 -#: users/templates/users/user_detail.html:543 +#: users/templates/users/user_detail.html:277 +#: users/templates/users/user_detail.html:454 +#: users/templates/users/user_detail.html:480 +#: users/templates/users/user_detail.html:503 +#: users/templates/users/user_detail.html:548 #: users/templates/users/user_group_create_update.html:28 #: users/templates/users/user_group_list.html:120 #: users/templates/users/user_list.html:256 @@ -1754,8 +1778,8 @@ msgstr "创建管理用户" #: assets/templates/assets/admin_user_list.html:123 #: assets/templates/assets/admin_user_list.html:154 -#: assets/templates/assets/asset_list.html:304 -#: assets/templates/assets/asset_list.html:341 +#: assets/templates/assets/asset_list.html:307 +#: assets/templates/assets/asset_list.html:344 #: assets/templates/assets/system_user_list.html:186 #: assets/templates/assets/system_user_list.html:217 #: users/templates/users/user_group_list.html:164 @@ -1874,66 +1898,66 @@ msgstr "禁用所选" msgid "Active selected" msgstr "激活所选" -#: assets/templates/assets/asset_list.html:193 +#: assets/templates/assets/asset_list.html:194 msgid "Add assets to node" msgstr "添加资产到节点" -#: assets/templates/assets/asset_list.html:194 +#: assets/templates/assets/asset_list.html:195 msgid "Move assets to node" msgstr "移动资产到节点" -#: assets/templates/assets/asset_list.html:196 +#: assets/templates/assets/asset_list.html:197 msgid "Refresh node hardware info" msgstr "更新节点资产硬件信息" -#: assets/templates/assets/asset_list.html:197 +#: assets/templates/assets/asset_list.html:198 msgid "Test node connective" msgstr "测试节点资产可连接性" -#: assets/templates/assets/asset_list.html:199 +#: assets/templates/assets/asset_list.html:200 msgid "Display only current node assets" msgstr "仅显示当前节点资产" -#: assets/templates/assets/asset_list.html:200 +#: assets/templates/assets/asset_list.html:201 msgid "Displays all child node assets" msgstr "显示所有子节点资产" -#: assets/templates/assets/asset_list.html:418 +#: assets/templates/assets/asset_list.html:421 #: assets/templates/assets/system_user_list.html:127 -#: users/templates/users/user_detail.html:443 -#: users/templates/users/user_detail.html:469 -#: users/templates/users/user_detail.html:537 +#: users/templates/users/user_detail.html:448 +#: users/templates/users/user_detail.html:474 +#: users/templates/users/user_detail.html:542 #: users/templates/users/user_group_list.html:114 #: users/templates/users/user_list.html:250 #: xpack/plugins/interface/templates/interface/interface.html:97 msgid "Are you sure?" msgstr "你确认吗?" -#: assets/templates/assets/asset_list.html:419 +#: assets/templates/assets/asset_list.html:422 msgid "This will delete the selected assets !!!" msgstr "删除选择资产" -#: assets/templates/assets/asset_list.html:422 +#: assets/templates/assets/asset_list.html:425 #: assets/templates/assets/system_user_list.html:131 -#: users/templates/users/user_detail.html:447 -#: users/templates/users/user_detail.html:473 -#: users/templates/users/user_detail.html:541 +#: users/templates/users/user_detail.html:452 +#: users/templates/users/user_detail.html:478 +#: users/templates/users/user_detail.html:546 #: users/templates/users/user_group_list.html:118 #: users/templates/users/user_list.html:254 #: xpack/plugins/interface/templates/interface/interface.html:101 msgid "Cancel" msgstr "取消" -#: assets/templates/assets/asset_list.html:433 +#: assets/templates/assets/asset_list.html:436 msgid "Asset Deleted." msgstr "已被删除" -#: assets/templates/assets/asset_list.html:434 -#: assets/templates/assets/asset_list.html:442 +#: assets/templates/assets/asset_list.html:437 +#: assets/templates/assets/asset_list.html:445 msgid "Asset Delete" msgstr "删除" -#: assets/templates/assets/asset_list.html:441 +#: assets/templates/assets/asset_list.html:444 msgid "Asset Deleting failed." msgstr "删除失败" @@ -2046,21 +2070,21 @@ msgstr "创建网域" msgid "Create label" msgstr "创建标签" -#: assets/templates/assets/system_user_assets.html:27 +#: assets/templates/assets/system_user_assets.html:35 msgid "Assets of " msgstr "资产" -#: assets/templates/assets/system_user_assets.html:56 +#: assets/templates/assets/system_user_assets.html:64 #: assets/templates/assets/system_user_detail.html:143 msgid "Test assets connective" msgstr "测试资产可连接性" -#: assets/templates/assets/system_user_assets.html:65 +#: assets/templates/assets/system_user_assets.html:73 #: assets/templates/assets/system_user_detail.html:134 msgid "Push system user now" msgstr "立刻推送系统" -#: assets/templates/assets/system_user_assets.html:87 +#: assets/templates/assets/system_user_assets.html:95 msgid "Add to node" msgstr "添加到节点" @@ -2219,29 +2243,29 @@ msgid "System user asset" msgstr "系统用户资产" #: audits/models.py:19 audits/models.py:42 audits/models.py:53 -#: audits/templates/audits/ftp_log_list.html:74 +#: audits/templates/audits/ftp_log_list.html:77 #: audits/templates/audits/operate_log_list.html:74 #: audits/templates/audits/password_change_log_list.html:56 -#: terminal/models.py:163 terminal/templates/terminal/session_list.html:28 +#: terminal/models.py:182 terminal/templates/terminal/session_list.html:28 #: terminal/templates/terminal/session_list.html:72 #: terminal/templates/terminal/terminal_detail.html:47 msgid "Remote addr" msgstr "远端地址" -#: audits/models.py:22 audits/templates/audits/ftp_log_list.html:75 +#: audits/models.py:22 audits/templates/audits/ftp_log_list.html:78 msgid "Operate" msgstr "操作" -#: audits/models.py:23 audits/templates/audits/ftp_log_list.html:57 -#: audits/templates/audits/ftp_log_list.html:76 +#: audits/models.py:23 audits/templates/audits/ftp_log_list.html:60 +#: audits/templates/audits/ftp_log_list.html:79 msgid "Filename" msgstr "文件名" #: audits/models.py:24 audits/models.py:77 -#: audits/templates/audits/ftp_log_list.html:77 -#: ops/templates/ops/command_execution_list.html:66 +#: audits/templates/audits/ftp_log_list.html:80 +#: ops/templates/ops/command_execution_list.html:71 #: ops/templates/ops/task_list.html:15 -#: users/templates/users/user_detail.html:519 +#: users/templates/users/user_detail.html:524 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:14 #: xpack/plugins/cloud/api.py:61 msgid "Success" @@ -2270,7 +2294,7 @@ msgstr "修改者" msgid "Disabled" msgstr "禁用" -#: audits/models.py:72 settings/models.py:18 +#: audits/models.py:72 settings/models.py:32 #: users/templates/users/user_detail.html:97 msgid "Enabled" msgstr "启用" @@ -2302,7 +2326,7 @@ msgstr "Agent" #: audits/models.py:86 audits/templates/audits/login_log_list.html:62 #: authentication/templates/authentication/_mfa_confirm_modal.html:14 -#: users/forms.py:194 users/models/user.py:451 +#: users/forms.py:194 users/models/user.py:455 #: users/templates/users/first_login.html:45 msgid "MFA" msgstr "MFA" @@ -2318,7 +2342,7 @@ msgstr "原因" #: audits/models.py:88 audits/templates/audits/login_log_list.html:64 #: tickets/templates/tickets/ticket_detail.html:34 #: tickets/templates/tickets/ticket_list.html:36 -#: tickets/templates/tickets/ticket_list.html:101 +#: tickets/templates/tickets/ticket_list.html:104 #: xpack/plugins/cloud/models.py:275 xpack/plugins/cloud/models.py:310 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:70 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:65 @@ -2329,14 +2353,14 @@ msgstr "状态" msgid "Date login" msgstr "登录日期" -#: audits/templates/audits/ftp_log_list.html:78 +#: audits/templates/audits/ftp_log_list.html:81 #: ops/templates/ops/adhoc_history.html:50 #: ops/templates/ops/adhoc_history_detail.html:59 -#: ops/templates/ops/command_execution_list.html:67 +#: ops/templates/ops/command_execution_list.html:72 #: ops/templates/ops/task_history.html:56 perms/models/base.py:52 #: perms/templates/perms/asset_permission_detail.html:81 #: perms/templates/perms/remote_app_permission_detail.html:73 -#: terminal/models.py:170 terminal/templates/terminal/session_list.html:32 +#: terminal/models.py:188 terminal/templates/terminal/session_list.html:32 #: xpack/plugins/change_auth_plan/models.py:250 #: xpack/plugins/change_auth_plan/models.py:426 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:59 @@ -2355,25 +2379,14 @@ msgstr "选择用户" #: audits/templates/audits/login_log_list.html:46 #: audits/templates/audits/operate_log_list.html:62 #: audits/templates/audits/password_change_log_list.html:46 -#: ops/templates/ops/command_execution_list.html:44 #: ops/templates/ops/command_execution_list.html:49 +#: ops/templates/ops/command_execution_list.html:54 #: templates/_base_list.html:37 templates/_user_profile.html:23 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:52 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:48 msgid "Search" msgstr "搜索" -#: audits/templates/audits/login_log_list.html:56 -#: authentication/templates/authentication/_access_key_modal.html:30 -#: ops/templates/ops/adhoc_detail.html:47 -#: ops/templates/ops/adhoc_history_detail.html:47 -#: ops/templates/ops/task_detail.html:54 -#: terminal/templates/terminal/session_list.html:24 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:64 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:60 -msgid "ID" -msgstr "ID" - #: audits/templates/audits/login_log_list.html:59 msgid "UA" msgstr "Agent" @@ -2537,12 +2550,12 @@ msgstr "MFA 验证码" msgid "Private Token" msgstr "ssh密钥" -#: authentication/models.py:44 users/templates/users/user_detail.html:267 +#: authentication/models.py:44 users/templates/users/user_detail.html:271 msgid "Reviewers" msgstr "审批人" #: authentication/models.py:53 tickets/models/ticket.py:25 -#: users/templates/users/user_detail.html:259 +#: users/templates/users/user_detail.html:263 msgid "Login confirm" msgstr "登录复核" @@ -2568,14 +2581,14 @@ msgid "Show" msgstr "显示" #: authentication/templates/authentication/_access_key_modal.html:66 -#: users/models/user.py:351 users/templates/users/user_profile.html:94 +#: users/models/user.py:355 users/templates/users/user_profile.html:94 #: users/templates/users/user_profile.html:163 #: users/templates/users/user_profile.html:166 msgid "Disable" msgstr "禁用" #: authentication/templates/authentication/_access_key_modal.html:67 -#: users/models/user.py:352 users/templates/users/user_profile.html:92 +#: users/models/user.py:356 users/templates/users/user_profile.html:92 #: users/templates/users/user_profile.html:170 msgid "Enable" msgstr "启用" @@ -2790,6 +2803,10 @@ msgstr "" msgid "discard time" msgstr "" +#: common/utils/ipip/utils.py:15 +msgid "Invalid ip" +msgstr "无效 IP" + #: common/validators.py:11 msgid "Special char not allowed" msgstr "不能包含特殊字符" @@ -2829,7 +2846,7 @@ msgstr "" "div>
    如果你看到了这个页面，证明你访问的不是nginx监听的端口，祝你好运" -#: ops/api/celery.py:54 +#: ops/api/celery.py:57 msgid "Waiting task start" msgstr "等待任务开始" @@ -2871,9 +2888,9 @@ msgid "Options" msgstr "选项" #: ops/models/adhoc.py:186 ops/templates/ops/adhoc_detail.html:51 -#: ops/templates/ops/command_execution_list.html:60 +#: ops/templates/ops/command_execution_list.html:65 #: ops/templates/ops/task_adhoc.html:57 ops/templates/ops/task_list.html:14 -#: terminal/forms/storage.py:107 +#: terminal/forms/storage.py:152 msgid "Hosts" msgstr "主机" @@ -2960,6 +2977,14 @@ msgstr "命令 `{}` 不允许被执行 ......." msgid "Task end" msgstr "任务结束" +#: ops/tasks.py:63 +msgid "Clean task history period" +msgstr "定期清除任务历史" + +#: ops/tasks.py:76 +msgid "Clean celery log period" +msgstr "" + #: ops/templates/ops/adhoc_detail.html:17 #: ops/templates/ops/adhoc_history.html:17 msgid "Version detail" @@ -2972,7 +2997,7 @@ msgstr "执行历史" #: ops/templates/ops/adhoc_detail.html:70 #: ops/templates/ops/adhoc_detail.html:75 -#: ops/templates/ops/command_execution_list.html:63 +#: ops/templates/ops/command_execution_list.html:68 #: ops/templates/ops/task_adhoc.html:59 msgid "Run as" msgstr "运行用户" @@ -3036,7 +3061,7 @@ msgid "Run history detail" msgstr "执行历史详情" #: ops/templates/ops/adhoc_history_detail.html:20 -#: ops/templates/ops/command_execution_list.html:64 +#: ops/templates/ops/command_execution_list.html:69 #: terminal/backends/command/models.py:16 msgid "Output" msgstr "输出" @@ -3102,7 +3127,7 @@ msgstr "没有选择系统用户" msgid "Pending" msgstr "等待" -#: ops/templates/ops/command_execution_list.html:65 +#: ops/templates/ops/command_execution_list.html:70 msgid "Finished" msgstr "结束" @@ -3155,10 +3180,14 @@ msgstr "执行" msgid "Task start: " msgstr "任务开始: " -#: ops/utils.py:51 +#: ops/utils.py:53 msgid "Update task content: {}" msgstr "更新任务内容: {}" +#: ops/utils.py:63 +msgid "Disk used more than 80%: {} => {}" +msgstr "" + #: ops/views/adhoc.py:31 ops/views/adhoc.py:54 ops/views/adhoc.py:68 #: ops/views/adhoc.py:82 ops/views/adhoc.py:96 ops/views/adhoc.py:110 #: ops/views/adhoc.py:124 ops/views/command.py:48 ops/views/command.py:79 @@ -3206,10 +3235,10 @@ msgstr "提示：RDP 协议不支持单独控制上传或下载文件" #: perms/templates/perms/asset_permission_list.html:206 #: perms/templates/perms/remote_app_permission_list.html:16 #: templates/_nav.html:21 users/forms.py:313 users/models/group.py:26 -#: users/models/user.py:435 users/templates/users/_select_user_modal.html:16 +#: users/models/user.py:439 users/templates/users/_select_user_modal.html:16 #: users/templates/users/user_asset_permission.html:56 #: users/templates/users/user_asset_permission.html:87 -#: users/templates/users/user_detail.html:220 +#: users/templates/users/user_detail.html:222 #: users/templates/users/user_list.html:38 #: xpack/plugins/orgs/templates/orgs/org_list.html:16 msgid "User group" @@ -3254,7 +3283,7 @@ msgstr "资产授权" #: perms/models/base.py:53 #: perms/templates/perms/asset_permission_detail.html:85 #: perms/templates/perms/remote_app_permission_detail.html:77 -#: users/models/user.py:467 users/templates/users/user_detail.html:108 +#: users/models/user.py:471 users/templates/users/user_detail.html:108 #: users/templates/users/user_profile.html:120 msgid "Date expired" msgstr "失效日期" @@ -3305,7 +3334,7 @@ msgid "Add node to this permission" msgstr "添加节点" #: perms/templates/perms/asset_permission_asset.html:105 -#: users/templates/users/user_detail.html:237 +#: users/templates/users/user_detail.html:239 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_asset_list.html:105 msgid "Join" msgstr "加入" @@ -3811,7 +3840,7 @@ msgid "ex: Last\\s*login|success|成功" msgstr "" "登录telnet服务器成功后的提示正则表达式，如: Last\\s*login|success|成功 " -#: settings/models.py:82 users/templates/users/reset_password.html:68 +#: settings/models.py:97 users/templates/users/reset_password.html:68 #: users/templates/users/user_profile.html:20 msgid "Setting" msgstr "设置" @@ -3829,7 +3858,7 @@ msgid "Refresh cache" msgstr "刷新缓存" #: settings/templates/settings/_ldap_list_users_modal.html:33 -#: users/models/user.py:431 users/templates/users/user_detail.html:72 +#: users/models/user.py:435 users/templates/users/user_detail.html:72 #: users/templates/users/user_profile.html:59 msgid "Email" msgstr "邮件" @@ -3923,10 +3952,6 @@ msgstr "会话管理 -> 终端管理 -> 存储配置" msgid "Here" msgstr "这里" -#: settings/utils/ldap.py:128 -msgid "Search no entry matched in ou {}" -msgstr "在ou:{}中没有匹配条目" - #: settings/views.py:19 settings/views.py:46 settings/views.py:73 #: settings/views.py:105 settings/views.py:134 settings/views.py:161 #: templates/_nav.html:178 @@ -4065,7 +4090,7 @@ msgstr "" #: templates/_nav.html:17 users/views/group.py:28 users/views/group.py:45 #: users/views/group.py:63 users/views/group.py:82 users/views/group.py:99 -#: users/views/login.py:154 users/views/profile.py:88 +#: users/views/login.py:153 users/views/profile.py:88 #: users/views/profile.py:123 users/views/user.py:48 users/views/user.py:65 #: users/views/user.py:109 users/views/user.py:176 users/views/user.py:204 #: users/views/user.py:218 @@ -4108,9 +4133,9 @@ msgid "File manager" msgstr "文件管理" #: templates/_nav.html:101 terminal/views/storage.py:27 -#: terminal/views/storage.py:42 terminal/views/storage.py:94 -#: terminal/views/storage.py:118 terminal/views/storage.py:147 -#: terminal/views/storage.py:173 +#: terminal/views/storage.py:42 terminal/views/storage.py:96 +#: terminal/views/storage.py:120 terminal/views/storage.py:149 +#: terminal/views/storage.py:175 msgid "Terminal" msgstr "终端管理" @@ -4347,39 +4372,43 @@ msgstr "输入" msgid "Session" msgstr "会话" -#: terminal/forms/storage.py:40 +#: terminal/forms/storage.py:41 msgid "Container name" msgstr "容器名称" -#: terminal/forms/storage.py:43 +#: terminal/forms/storage.py:44 msgid "Account name" msgstr "账户名称" -#: terminal/forms/storage.py:46 +#: terminal/forms/storage.py:47 msgid "Account key" msgstr "账户密钥" -#: terminal/forms/storage.py:54 +#: terminal/forms/storage.py:55 msgid "Endpoint suffix" msgstr "端点后缀" -#: terminal/forms/storage.py:60 terminal/forms/storage.py:83 +#: terminal/forms/storage.py:61 terminal/forms/storage.py:84 +#: terminal/forms/storage.py:108 terminal/forms/storage.py:132 msgid "Bucket" msgstr "桶名称" -#: terminal/forms/storage.py:63 terminal/forms/storage.py:86 +#: terminal/forms/storage.py:64 terminal/forms/storage.py:87 +#: terminal/forms/storage.py:111 terminal/forms/storage.py:135 msgid "Access key" msgstr "" -#: terminal/forms/storage.py:67 terminal/forms/storage.py:90 +#: terminal/forms/storage.py:68 terminal/forms/storage.py:91 +#: terminal/forms/storage.py:115 terminal/forms/storage.py:139 msgid "Secret key" msgstr "" -#: terminal/forms/storage.py:71 terminal/forms/storage.py:94 +#: terminal/forms/storage.py:72 terminal/forms/storage.py:95 +#: terminal/forms/storage.py:119 terminal/forms/storage.py:146 msgid "Endpoint" msgstr "端点" -#: terminal/forms/storage.py:73 +#: terminal/forms/storage.py:74 #, python-brace-format msgid "" "\n" @@ -4388,7 +4417,7 @@ msgid "" " " msgstr "" -#: terminal/forms/storage.py:96 +#: terminal/forms/storage.py:97 terminal/forms/storage.py:121 #, python-brace-format msgid "" "\n" @@ -4398,7 +4427,13 @@ msgid "" " " msgstr "" -#: terminal/forms/storage.py:109 +#: terminal/forms/storage.py:143 xpack/plugins/cloud/models.py:304 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:109 +#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:62 +msgid "Region" +msgstr "地域" + +#: terminal/forms/storage.py:154 msgid "" "\n" " Tips: If there are multiple hosts, separate them with a comma " @@ -4413,11 +4448,11 @@ msgstr "" " eg: http://www.jumpserver.a.com,http://www.jumpserver.b.com\n" " " -#: terminal/forms/storage.py:117 +#: terminal/forms/storage.py:162 msgid "Index" msgstr "索引" -#: terminal/forms/storage.py:120 +#: terminal/forms/storage.py:165 msgid "Doc type" msgstr "文档类型" @@ -4452,43 +4487,39 @@ msgstr "远端地址" msgid "HTTP Port" msgstr "HTTP端口" -#: terminal/models.py:129 +#: terminal/models.py:145 msgid "Session Online" msgstr "在线会话" -#: terminal/models.py:130 +#: terminal/models.py:146 msgid "CPU Usage" msgstr "CPU使用" -#: terminal/models.py:131 +#: terminal/models.py:147 msgid "Memory Used" msgstr "内存使用" -#: terminal/models.py:132 +#: terminal/models.py:148 msgid "Connections" msgstr "连接数" -#: terminal/models.py:133 +#: terminal/models.py:149 msgid "Threads" msgstr "线程数" -#: terminal/models.py:134 +#: terminal/models.py:150 msgid "Boot Time" msgstr "运行时间" -#: terminal/models.py:165 terminal/templates/terminal/session_list.html:135 +#: terminal/models.py:184 terminal/templates/terminal/session_list.html:135 msgid "Replay" msgstr "回放" -#: terminal/models.py:169 -msgid "Date last active" -msgstr "最后活跃日期" - -#: terminal/models.py:171 +#: terminal/models.py:189 msgid "Date end" msgstr "结束日期" -#: terminal/models.py:264 +#: terminal/models.py:282 msgid "Args" msgstr "参数" @@ -4501,12 +4532,12 @@ msgid "Goto" msgstr "转到" #: terminal/templates/terminal/command_storage_list.html:5 -#: terminal/views/storage.py:148 +#: terminal/views/storage.py:150 msgid "Create command storage" msgstr "创建命令存储" #: terminal/templates/terminal/replay_storage_list.html:5 -#: terminal/views/storage.py:95 +#: terminal/views/storage.py:97 msgid "Create replay storage" msgstr "创建录像存储" @@ -4595,7 +4626,7 @@ msgstr "接受" #: terminal/templates/terminal/terminal_list.html:81 #: tickets/models/ticket.py:31 tickets/templates/tickets/ticket_detail.html:101 -#: tickets/templates/tickets/ticket_list.html:107 +#: tickets/templates/tickets/ticket_list.html:110 msgid "Reject" msgstr "拒绝" @@ -4619,11 +4650,11 @@ msgstr "录像存储列表" msgid "Command storage list" msgstr "命令存储列表" -#: terminal/views/storage.py:119 +#: terminal/views/storage.py:121 msgid "Update replay storage" msgstr "更新录像存储" -#: terminal/views/storage.py:174 +#: terminal/views/storage.py:176 msgid "Update command storage" msgstr "更新命令存储" @@ -4649,11 +4680,11 @@ msgid "" msgstr "你可以使用ssh客户端工具连接终端" #: tickets/models/ticket.py:18 tickets/models/ticket.py:70 -#: tickets/templates/tickets/ticket_list.html:102 +#: tickets/templates/tickets/ticket_list.html:105 msgid "Open" msgstr "开启" -#: tickets/models/ticket.py:19 tickets/templates/tickets/ticket_list.html:103 +#: tickets/models/ticket.py:19 tickets/templates/tickets/ticket_list.html:106 msgid "Closed" msgstr "关闭" @@ -4662,7 +4693,7 @@ msgid "General" msgstr "一般" #: tickets/models/ticket.py:30 tickets/templates/tickets/ticket_detail.html:100 -#: tickets/templates/tickets/ticket_list.html:106 +#: tickets/templates/tickets/ticket_list.html:109 msgid "Approve" msgstr "同意" @@ -4671,7 +4702,7 @@ msgid "User display name" msgstr "用户显示名称" #: tickets/models/ticket.py:36 tickets/templates/tickets/ticket_list.html:33 -#: tickets/templates/tickets/ticket_list.html:99 +#: tickets/templates/tickets/ticket_list.html:102 msgid "Title" msgstr "标题" @@ -4800,7 +4831,7 @@ msgstr "工单详情" msgid "Could not reset self otp, use profile reset instead" msgstr "不能再该页面重置MFA, 请去个人信息页面重置" -#: users/forms.py:47 users/models/user.py:439 +#: users/forms.py:47 users/models/user.py:443 #: users/templates/users/_select_user_modal.html:15 #: users/templates/users/user_detail.html:88 #: users/templates/users/user_list.html:37 @@ -4808,7 +4839,7 @@ msgstr "不能再该页面重置MFA, 请去个人信息页面重置" msgid "Role" msgstr "角色" -#: users/forms.py:51 users/models/user.py:474 +#: users/forms.py:51 users/models/user.py:478 #: users/templates/users/user_detail.html:104 #: users/templates/users/user_list.html:39 #: users/templates/users/user_profile.html:102 @@ -4828,7 +4859,7 @@ msgstr "" msgid "Paste user id_rsa.pub here." msgstr "复制用户公钥到这里" -#: users/forms.py:71 users/templates/users/user_detail.html:228 +#: users/forms.py:71 users/templates/users/user_detail.html:230 msgid "Join user groups" msgstr "添加到用户组" @@ -4926,7 +4957,7 @@ msgstr "选择用户" msgid "User auth from {}, go there change password" msgstr "用户认证源来自 {}, 请去相应系统修改密码" -#: users/models/user.py:147 users/models/user.py:564 +#: users/models/user.py:147 users/models/user.py:571 msgid "Administrator" msgstr "管理员" @@ -4947,27 +4978,27 @@ msgstr "组织管理员" msgid "Org auditor" msgstr "组织审计员" -#: users/models/user.py:353 users/templates/users/user_profile.html:90 +#: users/models/user.py:357 users/templates/users/user_profile.html:90 msgid "Force enable" msgstr "强制启用" -#: users/models/user.py:419 +#: users/models/user.py:423 msgid "Local" msgstr "数据库" -#: users/models/user.py:442 +#: users/models/user.py:446 msgid "Avatar" msgstr "头像" -#: users/models/user.py:445 users/templates/users/user_detail.html:83 +#: users/models/user.py:449 users/templates/users/user_detail.html:83 msgid "Wechat" msgstr "微信" -#: users/models/user.py:478 +#: users/models/user.py:482 msgid "Date password last updated" msgstr "最后更新密码日期" -#: users/models/user.py:567 +#: users/models/user.py:574 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" @@ -5139,7 +5170,7 @@ msgid "Always young, always with tears in my eyes. Stay foolish Stay hungry" msgstr "永远年轻，永远热泪盈眶 stay foolish stay hungry" #: users/templates/users/reset_password.html:46 -#: users/templates/users/user_detail.html:434 users/utils.py:83 +#: users/templates/users/user_detail.html:439 users/utils.py:83 msgid "Reset password" msgstr "重置密码" @@ -5258,7 +5289,7 @@ msgid "Send reset ssh key mail" msgstr "发送重置密钥邮件" #: users/templates/users/user_detail.html:206 -#: users/templates/users/user_detail.html:522 +#: users/templates/users/user_detail.html:527 msgid "Unblock user" msgstr "解除登录限制" @@ -5266,46 +5297,46 @@ msgstr "解除登录限制" msgid "Unblock" msgstr "解除" -#: users/templates/users/user_detail.html:377 +#: users/templates/users/user_detail.html:382 msgid "Goto profile page enable MFA" msgstr "请去个人信息页面启用自己的MFA" -#: users/templates/users/user_detail.html:433 +#: users/templates/users/user_detail.html:438 msgid "An e-mail has been sent to the user`s mailbox." msgstr "已发送邮件到用户邮箱" -#: users/templates/users/user_detail.html:444 +#: users/templates/users/user_detail.html:449 msgid "This will reset the user password and send a reset mail" msgstr "将失效用户当前密码，并发送重设密码邮件到用户邮箱" -#: users/templates/users/user_detail.html:459 +#: users/templates/users/user_detail.html:464 msgid "" "The reset-ssh-public-key E-mail has been sent successfully. Please inform " "the user to update his new ssh public key." msgstr "重设密钥邮件将会发送到用户邮箱" -#: users/templates/users/user_detail.html:460 +#: users/templates/users/user_detail.html:465 msgid "Reset SSH public key" msgstr "重置SSH密钥" -#: users/templates/users/user_detail.html:470 +#: users/templates/users/user_detail.html:475 msgid "This will reset the user public key and send a reset mail" msgstr "将会失效用户当前密钥，并发送重置邮件到用户邮箱" -#: users/templates/users/user_detail.html:488 +#: users/templates/users/user_detail.html:493 msgid "Successfully updated the SSH public key." msgstr "更新ssh密钥成功" -#: users/templates/users/user_detail.html:489 -#: users/templates/users/user_detail.html:493 +#: users/templates/users/user_detail.html:494 +#: users/templates/users/user_detail.html:498 msgid "User SSH public key update" msgstr "ssh密钥" -#: users/templates/users/user_detail.html:538 +#: users/templates/users/user_detail.html:543 msgid "After unlocking the user, the user can log in normally." msgstr "解除用户登录限制后，此用户即可正常登录" -#: users/templates/users/user_detail.html:552 +#: users/templates/users/user_detail.html:557 msgid "Reset user MFA success" msgstr "重置用户MFA成功" @@ -5696,7 +5727,7 @@ msgstr "Token错误或失效" msgid "Password not same" msgstr "密码不一致" -#: users/views/login.py:154 +#: users/views/login.py:153 msgid "First login" msgstr "首次登录" @@ -6084,12 +6115,6 @@ msgstr "同步实例任务历史" msgid "Instance" msgstr "实例" -#: xpack/plugins/cloud/models.py:304 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:109 -#: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:62 -msgid "Region" -msgstr "地域" - #: xpack/plugins/cloud/providers/aliyun.py:14 msgid "Aliyun" msgstr "阿里云" @@ -6478,6 +6503,12 @@ msgstr "密码匣子" msgid "vault create" msgstr "创建" +#~ msgid "Search no entry matched in ou {}" +#~ msgstr "在ou:{}中没有匹配条目" + +#~ msgid "Date last active" +#~ msgstr "最后活跃日期" + #~ msgid "" #~ "Error: Account invalid (Please make sure the information such as Access " #~ "key or Secret key is correct)" @@ -6697,9 +6728,6 @@ msgstr "创建" #~ msgid "already exists" #~ msgstr "已经存在" -#~ msgid "Invalid file." -#~ msgstr "文件不合法" - #~ msgid "Refresh all node assets amount" #~ msgstr "刷新所有节点资产数量"