From c67a9eb845edfa867aff4a0bbd1c4cde430e1d1d Mon Sep 17 00:00:00 2001 From: liuzheng Date: Thu, 15 Mar 2018 07:27:30 +0800 Subject: [PATCH 01/18] Update quickstart.rst --- docs/quickstart.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/quickstart.rst b/docs/quickstart.rst index 3a5315416..7b316c304 100644 --- a/docs/quickstart.rst +++ b/docs/quickstart.rst @@ -13,7 +13,7 @@ Docker 安装见: `Docker官方安装文档 `_ ``````````````` 使用 root 命令行输入:: - $ docker run -d -p 8080:80 -p 2222:2222 registry.jumpserver.org/public/jumpserver:latest + $ docker run -d -p 8080:80 -p 2222:2222 registry.jumpserver.org/public/jumpserver:1.0.0 访问 ``````````````` @@ -42,10 +42,13 @@ XShell等工具请添加connection连接 :: - docker run -d -p 8080:80 -p 2222:2222 -e DB_ENGINE=mysql -e DB_HOST=192.168.1.1 -e DB_PORT=3306 -e DB_USER=root -e DB_PASSWORD=xxx -e DB_NAME=jumpserver registry.jumpserver.org/public/jumpserver:latest + docker run -d -p 8080:80 -p 2222:2222 -e DB_ENGINE=mysql -e DB_HOST=192.168.1.1 -e DB_PORT=3306 -e DB_USER=root -e DB_PASSWORD=xxx -e DB_NAME=jumpserver registry.jumpserver.org/public/jumpserver:1.0.0 仓库地址 ``````````````` https://github.com/jumpserver/Dockerfile + + + From eeae989c06f3beeefb5caa0cec745971c6d695db Mon Sep 17 00:00:00 2001 From: liuzheng Date: Thu, 15 Mar 2018 07:30:32 +0800 Subject: [PATCH 02/18] Update step_by_step.rst --- docs/step_by_step.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index afa11a8f4..761debc00 100644 --- a/docs/step_by_step.rst +++ b/docs/step_by_step.rst @@ -49,7 +49,7 @@ # 看到下面的提示符代表成功，以后运行 Jumpserver 都要先运行以上 source 命令，以下所有命令均在该虚拟环境中运行 (py3) [root@localhost py3] -二. 安装 Jumpserver 0.5.0 +二. 安装 Jumpserver 1.0.0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ **2.1 下载或 Clone 项目** @@ -201,7 +201,7 @@ Luna 已改为纯前端，需要 Nginx 来运行访问 -访问（https://github.com/jumpserver/luna/releases）下载对应 release 包，直接解压，不需要编译 +访问（https://github.com/jumpserver/luna/releases）下载 1.0.0 的包，直接解压，不需要编译 4.1 解压 Luna @@ -228,7 +228,7 @@ Luna 已改为纯前端，需要 Nginx 来运行访问 -p 8081:8080 -v /opt/guacamole/key:/config/guacamole/key \ -e JUMPSERVER_KEY_DIR=/config/guacamole/key \ -e JUMPSERVER_SERVER=http://<填写本机的IP地址>:8080 \ - registry.jumpserver.org/public/guacamole:latest + registry.jumpserver.org/public/guacamole:1.0.0 这里所需要注意的是 guacamole 暴露出来的端口是 8081，若与主机上其他端口冲突请自定义一下。 From 227804b7ab84b0b6ef0c104a3f71634d29e1725d Mon Sep 17 00:00:00 2001 From: liuzheng Date: Thu, 15 Mar 2018 07:33:56 +0800 Subject: [PATCH 03/18] Update step_by_step.rst --- docs/step_by_step.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/step_by_step.rst b/docs/step_by_step.rst index 761debc00..6549b4bde 100644 --- a/docs/step_by_step.rst +++ b/docs/step_by_step.rst @@ -201,7 +201,7 @@ Luna 已改为纯前端，需要 Nginx 来运行访问 -访问（https://github.com/jumpserver/luna/releases）下载 1.0.0 的包，直接解压，不需要编译 +访问（https://github.com/jumpserver/luna/releases）下载对应版本的 release 包，直接解压，不需要编译 4.1 解压 Luna From 8b3b517babbb6ce381183070cba3cfadc54310c0 Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 11 Apr 2018 15:24:12 +0800 Subject: [PATCH 04/18] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E6=8E=88?= =?UTF-8?q?=E6=9D=83=E8=A7=84=E5=88=99=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/__init__.py | 2 +- apps/assets/models/asset.py | 2 +- apps/assets/models/user.py | 2 +- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 30560 -> 30648 bytes apps/i18n/zh/LC_MESSAGES/django.po | 477 ++++++++++-------- apps/perms/api.py | 76 ++- apps/perms/forms.py | 13 + apps/perms/models.py | 18 +- .../perms/asset_permission_asset.html | 38 +- .../perms/asset_permission_detail.html | 46 +- .../perms/asset_permission_user.html | 6 +- apps/perms/urls/api_urls.py | 54 +- apps/perms/urls/views_urls.py | 4 +- apps/perms/views.py | 68 ++- apps/users/models/user.py | 2 +- 15 files changed, 518 insertions(+), 290 deletions(-) diff --git a/apps/__init__.py b/apps/__init__.py index 6110e1346..af5b4a679 100644 --- a/apps/__init__.py +++ b/apps/__init__.py @@ -2,4 +2,4 @@ # -*- coding: utf-8 -*- # -__version__ = "1.0.0" +__version__ = "1.3.0" diff --git a/apps/assets/models/asset.py b/apps/assets/models/asset.py index 1f42a2978..96bd598b0 100644 --- a/apps/assets/models/asset.py +++ b/apps/assets/models/asset.py @@ -84,7 +84,7 @@ class Asset(models.Model): comment = models.TextField(max_length=128, default='', blank=True, verbose_name=_('Comment')) def __str__(self): - return self.hostname + return '{0.hostname}({0.ip})'.format(self) @property def is_valid(self): diff --git a/apps/assets/models/user.py b/apps/assets/models/user.py index e0de2cf49..bf31b8491 100644 --- a/apps/assets/models/user.py +++ b/apps/assets/models/user.py @@ -109,7 +109,7 @@ class SystemUser(AssetUser): shell = models.CharField(max_length=64, default='/bin/bash', verbose_name=_('Shell')) def __str__(self): - return self.name + return '{0.name}({0.username})'.format(self) def to_json(self): return { diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index 61ef6ec21bb6059e9edbfaf75676af11deac619e..1d2577577a73c75a8ad2ee49c5b55cd99680e7b3 100644 GIT binary patch delta 11016 zcmZA737k*m9>?)B!;Bd-!!Q`KjV*iDF`5u&LNplb80%m%8VrL*3rF^)ME|CgB@*f? z%KuufgwldiA(DMxB8o&w?&teIKlkNz&+GoYf6wnc=Xsvd>a1^N{0|#H4zT zqf2{Xb9@GC;0E&qhSCnNADGW|qDcx-sEaxgZ#KiCw3Dy^cExb)iCSm|hT#M(i_v=A)Dch!Vp}5 z+`O|CwSez229Kcn|B9OUA5{MW4IL*E!?6hSJEcfUVKvkM&2$3Wp*r?N4K&!!=b{!m z0o89NYG>x7`oE3QxCXT|+fa|@2tI($jlB+tG;qFHLfYf}Zhp>u}QyYV2JQVU|Qa z^NOg6YoG?Mhk8T_cD^n0o;jUSH!u;ku&Jp2vrS)P_P-5<1r)S(r%(f3MNM?qI)=r2 zcNC2ppaN>^A4F|+JeI&VsGaPM>Nf;6P7dl(j6>b|tEl-_xFmW6e$>`{joP~Xs0mJ^ zI$p!#co#K5@g`ooDr&+6R6Pmx2)m;eFaWi{EY$eVpmt<3YFu{)iB_0zg~g}=SD`N4 zfEsXzxewL<7;3`vsEPhW?OafT_x2Yp@8cVbQTqJ1BGJH|Pr>^`B$yeAEPsQT^UQE%1Ge!%e8`4%_)Ns0Ck^`uyLrLcxcsmb?wL`5@JJc36a4N=PI_e$C#XdL{>)|O3yfca3#8pw_)JInX#FOY{Xo0$u z4yXxIksk$4Z?hljD>cKMg7s;yL``%MAIGpqydCO-8n+kfj-NzLoQs+#?-BN27mlZ( zg?wPHM{VI&)HB|VTF^<iT1-e&?AJha{sCQumYC%t0aBeu)~_ z-9w_6<44p2F5(0D7wXxUY~f8@8g*eDYJ%FRm#r!4PCB3#n2wroAnGeU+v+)}{&}d0 zXCXV`I&(>M!Rx4jmZ08=HK=#sIO^^G1+~zSN4=LY)=Wh0NM9_A!_AqfiI$tIQ1g6* zy1`9YT%Z5_BvmO~Ky6V}ORr;b)B?()wzekf4&zZ1Hb)JZf_fA^P&+gLbv_##;&Z5l zuSSi(4fRFz1x7Nzb4UrEN3HmG)PR3sX)M^vo47pc5miIoK@-%=l#1H9G}JE)Z^3l@0$p7g*V-GP9%=zCP%BJEeiA#q?EFipPr*X0gMKWJCs23x59*m0 zNb)8sgu1aJsD+h9y#v)zH<*~j{wqnQpsns`C;FIAT74vHt0$P#QCmD01Mdv#&eou| zdOd359jNb*{iyLTTK%Tg3nsJwT3P92Z)H_c7bc+YC>iw#9!LJ?4CD{JWGhiG<#yD- zhf(jwMbv_RGo8o0g%(BaXhqcd#;AoQxg@%?o|uCJa1?%z8nAU6?|gdcft^7;`!%S32T}7K#ZYw5k!U5qpkA7ww%#+1MeR&HYD-(0T~W_4 z6ZJBVL+#j1RR7md@66j+8xNo!ad11&NYr(ukn3EhI*GQhG3pLmV;HtGQ&G=49o6qC z3`~p~cqVE=KGZ^2U>t5l-SJPTm-ZNHoEv7yWO7tE@B5EP6u`sqpy;EH<@cVzZb$AwoIpJafoTLso z4I?lg^~{!{9@V?3?}06-JO2swC@!IP3g>gSzu7sQxuD3LB$tpmhrSuN9?H&;UbF zca($Ls#zF?`Iw2ztRCLc8?XfG`Z&~r>!DueL8$BVQ18kl)IxoztzVA1(JdYA^ZzXc zt@sdX!ZTO|uUS2)leYsAs0CI)4frr>!VVaQ{ZTJ*7U~X1pvIYEbsy>xzJa>oC9ZXN z7d6lZ)IeWjB>rHYL|u3VE8z{~eRN_wdlO`!&X2^&m}m9dm=eTpr1HBz^|UVR2JXc# zsJq>}vKo@I-I<&d>w0*1I=rX%_xOp}miiJbhZoF{G;hMnsCT2LwVRnqs2y#Ox{+>H z&p_==mREP33D#k@IUkGCVY#)}S^G0Y*%^IkMJ%Tm# z`G1T=1CGE7I2JX)tEfk^6!lK5L-pHk?lSkF`X4mUn%7V_a@X2L`I)PBIn)B`VBqI} z6D1Uq%+6+C^C>LN`8?EC&$ae4JHOfLJFR^Lwa|;!{?*!dP}dji?add9u3o09B)XuD znPPTBEv&b-vrsQ*j@8GZ2Aqmo;C$2<*GH&3TxV`IcbfZ9^BwKY{wq0SCoZA3=!SI& z>BDb1v?EddlFasIs+oo(INu+&pl?wNKWSb;U4PpQ?(4O~`||wNF`9xbk6J)2)Ey+6 z$*2K3q9*8WW}&Wo&e}6j*DbL6a&xV@6?OeL=5g1OYt|v8pSOVGsDUb@z9{Ngy|LAk zF|Z)i0=k<6%^dT2)Pyswz0iCQb-laZ3ZGbE7wT=_gW8GXR=hYaUlLvTlvi+`wGPvGI0;qHM-B9rxdPSi19Ox4mH7jz z|4D0Ku=Wis%>2&ZRw$I=eE}6g4OkZ+#zd@yV^9lu4R!uK)PmNV+fX~X3pL>()K9^a zsNX9tn^*B6+SkxkQfVN+3}9z-9zIEXFKVEN2YC~=M72}QZf0+6MSY;P-!WIA7PJ<% z@XxHiA9Vvq2J!ht|zEe8Jn-;G2A55X`Tfx0jc z)$s+afOD+<0jmEd)SZ56^&iZWcK!-#oExZ@@UGQM5B09Ah!yntZ%Cp6Q&AJ9nVG0Z zl50*v4fG1C|0*;?hP1emN6eR8<{Q5 z6f+&0bNvu=IcmJqcK&A!p?wqU;2qaa)Z*8df)o-^7c?`IFp_qA)Z5+@)o-}fb5Z?W z)DBIv`WvVlTVd_3*8T?7@2u(GvLqtMo2Y_W8>`c?De4^=VD;JNd~-P#;rv=Gil3qu zw8uP%x`E^7W%Ex@e*YWkT@Zun_<&g*^?7b==X;>;sIQ%W8g(a=F&baPintQ>as3J_ z<2kI0;iJ6ol?2o{T`}8-;TRlJIl_G zMLpx^u>elO2%Lr*=M~frEySYw{4Z02ek_jLQ4<`n`f00Qw|eMk?|h6IXVx_n&9+#R zak^Q10v4w|+uDoK)kLdEw1ADM749(iqE>puJZ=7ry6!jBfd8PbFUCKYgkdGrIJHna z(HNsK5hq{=)b+c@*w6nTDQJK*n25il2Cg^O8>ltv{1av$EJ=HqwI^X#hBzwfA93`kfxj{%hbr?L_#~-autg164sSq&})&66%?DMNQZfwL=-G{#oW&t4}g# zqWaIZ_M2Fn_EMKbZ|82*0JqJsJpMXGyCmwu)fj|#iF?O`B*_%@*0&~(r~}6=;v%7O zTM?J3|C`uJ{wmRn{3y|y;IAD#fBkXa5l5cN$!f%M^3|v>oj37WLPw5=Q`OqVaWPSX zI=>_Zet$ggyHhdN?QcC}a1}jD5i7_~6NkukMB+r;LcBrf7(jGU!g0jId4zsP$v5Kn zI0{P;IzIDoKBlcN`Io&mPne?)@j9W0#V-oZIAR7J`S$zY5o!bJ&1g#=OME~aCT39k z0Uy9yRW{8+OJj*vHH8_Uh4D7^;vF8ycJj)Nkif~F_DuKhz5lI za`y$HV>MBZ2&X<*1&&Y2hoKLDCvu4)L{(}p5$_P|iL1U*RbupC5;z}m_TDj={5|3z z@f4A4C;q`RwAT^)?{&s+Y3pc=$A}%)R&9gjO-=n5K>FdT<23mt@6qsoBT&$<13LU3 zP8mE$=tsbItBFQ7*meAX_MgOOgUqE;~+^7q9ZYf^WR$^{l4=Xan9O*k^6`)v|k{Wk&nco_zlsJd>(Ow z2)vq|@i_4=u}DRt7<@$hM&4I7j-sYMn{8>ohL`aPTtd7^o=I#VexZE|dlQ|>uiydH zp!gr8Lk!^LOGI<>slaI2jkgS)8xh>u~0_1&lW|7DHs*7-TCMBJu68~Pu|xqqFm3v2T2(so#;pV5b-xLiS{dmjt_C9 zmj?dqKzlRUy8CMTsV%hrpHpvcxw>RqzrNUpda$)qN0U53oUnqpLWgU_4f2~rDWbg% zwvk*%0T1Uv>ND-!0cz9zJ8Mn~^`+L2jT(_NIFo;58yu&^*SUUa|D5_qgM8x~rWDQ? zJvwtt+_0ge$M`ljEEgR&GBbDh(9xrZ=8T9NJ32Ghzq8?>V1GjV*)4#jv>VlzhgL1}>7~_Asd9_gAnxt_5mq~-7!WuM)YY?B)q`DUj_`C^F%>2-a@(qnvS=`oS#=FB*^X!7}2-#s^DgTG(;++hE$J_mz* vJNsSnec1n#h|QbM&RBnT?ixDyvj>z32|btp;l=4M`^RS%2=y<@-X8H^Y}ocl delta 10991 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 Rxr?Xgt=pM>clf@b{{#0u2r&Qv diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po index fc8255313..27c978fcd 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-04-06 10:24+0800\n" +"POT-Creation-Date: 2018-04-11 15:13+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -17,45 +17,57 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: assets/api/node.py:58 +#: assets/api/node.py:87 msgid "New node {}" msgstr "新节点 {}" -#: assets/api/node.py:133 +#: assets/api/node.py:202 msgid "更新节点资产硬件信息: {}" msgstr "" -#: assets/api/node.py:146 +#: assets/api/node.py:215 msgid "测试节点下资产是否可连接: {}" msgstr "" -#: assets/forms/asset.py:24 assets/forms/asset.py:60 assets/models/asset.py:53 -#: assets/models/user.py:102 assets/templates/assets/asset_detail.html:183 +#: assets/forms/asset.py:24 assets/models/asset.py:53 assets/models/user.py:103 +#: assets/templates/assets/asset_detail.html:183 #: assets/templates/assets/asset_detail.html:191 -#: assets/templates/assets/system_user_detail.html:166 +#: assets/templates/assets/system_user_detail.html:166 perms/models.py:23 msgid "Nodes" msgstr "节点管理" -#: assets/forms/asset.py:27 assets/forms/asset.py:63 assets/forms/asset.py:103 -#: assets/forms/asset.py:107 assets/models/asset.py:57 -#: assets/models/cluster.py:19 assets/models/user.py:71 +#: assets/forms/asset.py:27 assets/forms/asset.py:66 assets/forms/asset.py:109 +#: assets/forms/asset.py:113 assets/models/asset.py:57 +#: assets/models/cluster.py:19 assets/models/user.py:72 #: assets/templates/assets/asset_detail.html:73 templates/_nav.html:25 msgid "Admin user" msgstr "管理用户" -#: assets/forms/asset.py:30 assets/forms/asset.py:66 assets/models/asset.py:81 -#: assets/templates/assets/asset_create.html:33 -#: assets/templates/assets/asset_detail.html:220 -#: assets/templates/assets/asset_update.html:38 templates/_nav.html:27 -msgid "Labels" -msgstr "标签管理" +#: assets/forms/asset.py:30 assets/forms/asset.py:69 assets/forms/asset.py:125 +#: assets/templates/assets/asset_create.html:35 +#: assets/templates/assets/asset_create.html:37 +#: assets/templates/assets/asset_list.html:75 +#: assets/templates/assets/asset_update.html:40 +#: assets/templates/assets/asset_update.html:42 +#: assets/templates/assets/user_asset_list.html:34 +msgid "Label" +msgstr "标签" -#: assets/forms/asset.py:34 assets/forms/asset.py:70 assets/models/asset.py:52 +#: assets/forms/asset.py:34 assets/forms/asset.py:73 assets/models/asset.py:52 #: assets/models/domain.py:46 msgid "Domain" msgstr "网域" -#: assets/forms/asset.py:42 assets/forms/asset.py:79 +#: assets/forms/asset.py:38 assets/forms/asset.py:63 assets/forms/asset.py:77 +#: assets/forms/asset.py:128 assets/templates/assets/asset_create.html:29 +#: assets/templates/assets/asset_update.html:34 perms/forms.py:40 +#: perms/forms.py:47 perms/models.py:67 +#: perms/templates/perms/asset_permission_list.html:57 +#: perms/templates/perms/asset_permission_list.html:142 +msgid "Node" +msgstr "节点" + +#: assets/forms/asset.py:45 assets/forms/asset.py:85 msgid "" "root or other NOPASSWD sudo privilege user existed in asset,If asset is " "windows or other set any one, more see admin user left menu" @@ -63,46 +75,41 @@ msgstr "" "root或其他拥有NOPASSWD: ALL权限的用户, 如果是windows或其它硬件可以随意设置一" "个, 更多信息查看左侧 `管理用户` 菜单" -#: assets/forms/asset.py:45 assets/forms/asset.py:82 +#: assets/forms/asset.py:48 assets/forms/asset.py:88 msgid "* required Must set exact system platform, Windows, Linux ..." msgstr "* required 必须准确设置操作系统平台，如Windows, Linux ..." -#: assets/forms/asset.py:46 assets/forms/asset.py:83 +#: assets/forms/asset.py:49 assets/forms/asset.py:89 msgid "" "If your have some network not connect with each other, you can set domain" msgstr "如果有多个的互相隔离的网络，设置资产属于的网域，使用网域网关跳转登录" -#: assets/forms/asset.py:90 assets/forms/asset.py:94 assets/forms/domain.py:16 +#: assets/forms/asset.py:96 assets/forms/asset.py:100 assets/forms/domain.py:16 #: assets/forms/label.py:15 -#: perms/templates/perms/asset_permission_asset.html:88 users/forms.py:272 +#: perms/templates/perms/asset_permission_asset.html:88 msgid "Select assets" msgstr "选择资产" -#: assets/forms/asset.py:99 assets/models/asset.py:51 +#: assets/forms/asset.py:105 assets/models/asset.py:51 #: assets/models/domain.py:44 assets/templates/assets/admin_user_assets.html:53 #: assets/templates/assets/asset_detail.html:69 #: assets/templates/assets/domain_gateway_list.html:58 #: assets/templates/assets/system_user_asset.html:51 -#: assets/templates/assets/user_asset_list.html:21 msgid "Port" msgstr "端口" -#: assets/forms/asset.py:119 assets/templates/assets/asset_create.html:37 -msgid "Select labels" -msgstr "选择标签" - -#: assets/forms/asset.py:122 assets/templates/assets/admin_user_detail.html:91 -msgid "Select nodes" -msgstr "选择节点" - #: assets/forms/domain.py:14 assets/forms/label.py:13 -#: assets/models/asset.py:165 assets/templates/assets/admin_user_list.html:25 +#: assets/models/asset.py:169 assets/templates/assets/admin_user_list.html:25 #: assets/templates/assets/domain_detail.html:60 #: assets/templates/assets/domain_list.html:15 #: assets/templates/assets/label_list.html:16 #: assets/templates/assets/system_user_list.html:29 audits/models.py:11 #: audits/templates/audits/ftp_log_list.html:41 -#: audits/templates/audits/ftp_log_list.html:72 perms/models.py:17 +#: audits/templates/audits/ftp_log_list.html:72 perms/forms.py:37 +#: perms/models.py:22 +#: perms/templates/perms/asset_permission_create_update.html:40 +#: perms/templates/perms/asset_permission_list.html:56 +#: perms/templates/perms/asset_permission_list.html:139 #: terminal/backends/command/models.py:11 terminal/models.py:123 #: terminal/templates/terminal/command_list.html:40 #: terminal/templates/terminal/command_list.html:73 @@ -125,11 +132,12 @@ msgstr "资产" #: common/templates/common/terminal_setting.html:67 #: common/templates/common/terminal_setting.html:85 ops/models/adhoc.py:36 #: ops/templates/ops/task_detail.html:59 ops/templates/ops/task_list.html:35 -#: perms/models.py:14 perms/templates/perms/asset_permission_detail.html:62 +#: perms/models.py:19 perms/templates/perms/asset_permission_detail.html:62 +#: perms/templates/perms/asset_permission_list.html:53 #: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:16 #: terminal/models.py:149 terminal/templates/terminal/terminal_detail.html:43 #: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14 -#: users/models/user.py:35 users/templates/users/_select_user_modal.html:13 +#: users/models/user.py:40 users/templates/users/_select_user_modal.html:13 #: users/templates/users/user_detail.html:63 #: users/templates/users/user_group_detail.html:55 #: users/templates/users/user_group_list.html:12 @@ -145,8 +153,8 @@ msgstr "名称" #: assets/templates/assets/domain_gateway_list.html:60 #: assets/templates/assets/system_user_detail.html:62 #: assets/templates/assets/system_user_list.html:27 -#: perms/templates/perms/asset_permission_user.html:55 users/forms.py:14 -#: users/models/authentication.py:45 users/models/user.py:34 +#: perms/templates/perms/asset_permission_user.html:55 users/forms.py:13 +#: users/models/authentication.py:45 users/models/user.py:39 #: users/templates/users/_select_user_modal.html:14 #: users/templates/users/login.html:56 #: users/templates/users/login_log_list.html:49 @@ -161,7 +169,7 @@ msgid "Password or private key passphrase" msgstr "密码或密钥密码" #: assets/forms/user.py:25 assets/models/base.py:22 common/forms.py:113 -#: users/forms.py:16 users/forms.py:25 users/templates/users/login.html:59 +#: users/forms.py:15 users/forms.py:24 users/templates/users/login.html:59 #: users/templates/users/reset_password.html:52 #: users/templates/users/user_create.html:11 #: users/templates/users/user_password_update.html:40 @@ -170,7 +178,7 @@ msgstr "密码或密钥密码" msgid "Password" msgstr "密码" -#: assets/forms/user.py:28 users/models/user.py:45 +#: assets/forms/user.py:28 users/models/user.py:50 msgid "Private key" msgstr "ssh私钥" @@ -199,7 +207,7 @@ msgstr "高优先级的系统用户将会作为默认登录用户" #: assets/templates/assets/asset_list.html:87 #: assets/templates/assets/domain_gateway_list.html:57 #: assets/templates/assets/system_user_asset.html:50 -#: assets/templates/assets/user_asset_list.html:20 common/forms.py:144 +#: assets/templates/assets/user_asset_list.html:46 common/forms.py:144 #: perms/templates/perms/asset_permission_asset.html:55 #: users/templates/users/login_log_list.html:52 #: users/templates/users/user_granted_asset.html:45 @@ -212,7 +220,7 @@ msgstr "IP" #: assets/templates/assets/asset_detail.html:57 #: assets/templates/assets/asset_list.html:86 #: assets/templates/assets/system_user_asset.html:49 -#: assets/templates/assets/user_asset_list.html:19 common/forms.py:143 +#: assets/templates/assets/user_asset_list.html:45 common/forms.py:143 #: perms/templates/perms/asset_permission_asset.html:54 #: users/templates/users/user_granted_asset.html:44 #: users/templates/users/user_group_granted_asset.html:44 @@ -221,7 +229,6 @@ msgstr "主机名" #: assets/models/asset.py:54 assets/models/domain.py:48 #: assets/models/label.py:20 assets/templates/assets/asset_detail.html:105 -#: perms/templates/perms/asset_permission_list.html:70 msgid "Is active" msgstr "激活" @@ -289,15 +296,21 @@ msgstr "系统架构" msgid "Hostname raw" msgstr "主机名原始" +#: assets/models/asset.py:81 assets/templates/assets/asset_create.html:33 +#: assets/templates/assets/asset_detail.html:220 +#: assets/templates/assets/asset_update.html:38 templates/_nav.html:27 +msgid "Labels" +msgstr "标签管理" + #: assets/models/asset.py:82 assets/models/base.py:28 #: assets/models/cluster.py:28 assets/models/group.py:21 #: assets/templates/assets/admin_user_detail.html:68 #: assets/templates/assets/asset_detail.html:117 #: assets/templates/assets/domain_detail.html:72 #: assets/templates/assets/system_user_detail.html:96 -#: ops/templates/ops/adhoc_detail.html:86 perms/models.py:22 perms/models.py:79 -#: perms/templates/perms/asset_permission_detail.html:94 -#: users/models/user.py:50 users/templates/users/user_detail.html:99 +#: ops/templates/ops/adhoc_detail.html:86 perms/models.py:28 perms/models.py:72 +#: perms/templates/perms/asset_permission_detail.html:98 +#: users/models/user.py:55 users/templates/users/user_detail.html:99 msgid "Created by" msgstr "创建者" @@ -307,8 +320,8 @@ msgstr "创建者" #: assets/templates/assets/domain_detail.html:68 #: assets/templates/assets/system_user_detail.html:92 #: ops/templates/ops/adhoc_detail.html:90 ops/templates/ops/task_detail.html:63 -#: perms/models.py:23 perms/models.py:80 -#: perms/templates/perms/asset_permission_detail.html:90 +#: perms/models.py:29 perms/models.py:73 +#: 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 msgid "Date created" @@ -325,10 +338,10 @@ msgstr "创建日期" #: assets/templates/assets/domain_list.html:17 #: assets/templates/assets/system_user_detail.html:100 #: assets/templates/assets/system_user_list.html:33 common/models.py:30 -#: ops/models/adhoc.py:42 perms/models.py:24 perms/models.py:81 -#: perms/templates/perms/asset_permission_detail.html:98 terminal/models.py:26 +#: ops/models/adhoc.py:42 perms/models.py:30 perms/models.py:74 +#: perms/templates/perms/asset_permission_detail.html:102 terminal/models.py:26 #: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15 -#: users/models/user.py:47 users/templates/users/user_detail.html:111 +#: users/models/user.py:52 users/templates/users/user_detail.html:111 #: users/templates/users/user_group_detail.html:67 #: users/templates/users/user_group_list.html:14 #: users/templates/users/user_profile.html:114 @@ -351,7 +364,7 @@ msgstr "带宽" msgid "Contact" msgstr "联系人" -#: assets/models/cluster.py:22 users/models/user.py:41 +#: assets/models/cluster.py:22 users/models/user.py:46 #: users/templates/users/user_detail.html:76 msgid "Phone" msgstr "手机" @@ -377,7 +390,7 @@ msgid "Default" msgstr "默认" #: assets/models/cluster.py:36 assets/models/label.py:13 -#: users/models/user.py:266 +#: users/models/user.py:285 msgid "System" msgstr "系统" @@ -389,14 +402,14 @@ msgstr "默认Cluster" msgid "Cluster" msgstr "集群" -#: assets/models/domain.py:45 assets/models/user.py:104 +#: assets/models/domain.py:45 assets/models/user.py:106 #: assets/templates/assets/domain_gateway_list.html:59 #: assets/templates/assets/system_user_detail.html:66 #: assets/templates/assets/system_user_list.html:28 msgid "Protocol" msgstr "协议" -#: assets/models/group.py:30 perms/models.py:18 +#: assets/models/group.py:30 msgid "Asset group" msgstr "资产组" @@ -406,15 +419,19 @@ msgstr "默认资产组" #: assets/models/label.py:14 audits/models.py:9 #: audits/templates/audits/ftp_log_list.html:33 -#: audits/templates/audits/ftp_log_list.html:71 perms/models.py:15 +#: audits/templates/audits/ftp_log_list.html:71 perms/forms.py:14 +#: perms/forms.py:31 perms/models.py:20 +#: perms/templates/perms/asset_permission_create_update.html:36 +#: perms/templates/perms/asset_permission_list.html:54 +#: perms/templates/perms/asset_permission_list.html:133 #: terminal/backends/command/models.py:10 terminal/models.py:122 #: terminal/templates/terminal/command_list.html:32 #: terminal/templates/terminal/command_list.html:72 #: terminal/templates/terminal/session_list.html:33 -#: terminal/templates/terminal/session_list.html:71 users/forms.py:220 -#: users/models/user.py:30 users/models/user.py:254 +#: terminal/templates/terminal/session_list.html:71 users/forms.py:219 +#: users/models/user.py:30 users/models/user.py:273 #: users/templates/users/user_group_detail.html:78 -#: users/templates/users/user_group_list.html:13 users/views/user.py:334 +#: users/templates/users/user_group_list.html:13 users/views/user.py:335 msgid "User" msgstr "用户" @@ -431,30 +448,49 @@ msgstr "分类" msgid "Key" msgstr "" -#: assets/models/user.py:103 +#: assets/models/user.py:104 +#: assets/templates/assets/_asset_group_bulk_update_modal.html:11 +#: assets/templates/assets/system_user_asset.html:21 +#: assets/views/admin_user.py:29 assets/views/admin_user.py:47 +#: assets/views/admin_user.py:63 assets/views/admin_user.py:78 +#: assets/views/admin_user.py:102 assets/views/asset.py:49 +#: assets/views/asset.py:95 assets/views/asset.py:155 assets/views/asset.py:172 +#: assets/views/asset.py:196 assets/views/domain.py:29 +#: assets/views/domain.py:45 assets/views/domain.py:61 +#: assets/views/domain.py:74 assets/views/domain.py:98 +#: assets/views/domain.py:126 assets/views/domain.py:150 +#: assets/views/label.py:26 assets/views/label.py:42 assets/views/label.py:58 +#: assets/views/system_user.py:28 assets/views/system_user.py:44 +#: assets/views/system_user.py:60 assets/views/system_user.py:74 +#: templates/_nav.html:20 +msgid "Assets" +msgstr "资产管理" + +#: assets/models/user.py:105 msgid "Priority" msgstr "优先级" -#: assets/models/user.py:105 assets/templates/assets/_system_user.html:58 +#: assets/models/user.py:107 assets/templates/assets/_system_user.html:58 #: assets/templates/assets/system_user_detail.html:118 #: assets/templates/assets/system_user_update.html:11 msgid "Auto push" msgstr "自动推送" -#: assets/models/user.py:106 assets/templates/assets/system_user_detail.html:70 +#: assets/models/user.py:108 assets/templates/assets/system_user_detail.html:70 msgid "Sudo" msgstr "Sudo" -#: assets/models/user.py:107 assets/templates/assets/system_user_detail.html:75 +#: assets/models/user.py:109 assets/templates/assets/system_user_detail.html:75 msgid "Shell" msgstr "Shell" -#: assets/models/user.py:150 audits/models.py:12 +#: assets/models/user.py:149 audits/models.py:12 #: audits/templates/audits/ftp_log_list.html:49 -#: audits/templates/audits/ftp_log_list.html:73 perms/forms.py:25 -#: perms/models.py:19 perms/models.py:76 -#: perms/templates/perms/asset_permission_detail.html:136 -#: perms/templates/perms/asset_permission_list.html:69 templates/_nav.html:26 +#: audits/templates/audits/ftp_log_list.html:73 perms/forms.py:43 +#: perms/models.py:24 perms/models.py:69 +#: perms/templates/perms/asset_permission_detail.html:140 +#: perms/templates/perms/asset_permission_list.html:58 +#: perms/templates/perms/asset_permission_list.html:145 templates/_nav.html:26 #: terminal/backends/command/models.py:12 terminal/models.py:124 #: terminal/templates/terminal/command_list.html:48 #: terminal/templates/terminal/command_list.html:74 @@ -496,12 +532,8 @@ msgstr "测试系统用户可连接性: {}" msgid "定期测试系统用户可连接性: {}" msgstr "" -#: assets/tasks.py:392 -msgid "推送系统用户到节点资产: {} => {}" -msgstr "" - -#: assets/tasks.py:433 -msgid "推送节点系统用户到新加入资产中: {}" +#: assets/tasks.py:398 +msgid "推送系统用户到入资产: {}" msgstr "" #: assets/templates/assets/_asset_group_bulk_update_modal.html:5 @@ -512,28 +544,13 @@ msgstr "更新用户组" msgid "Hint: only change the field you want to update." msgstr "仅修改你需要更新的字段" -#: assets/templates/assets/_asset_group_bulk_update_modal.html:11 -#: assets/templates/assets/system_user_asset.html:21 -#: assets/views/admin_user.py:29 assets/views/admin_user.py:47 -#: assets/views/admin_user.py:63 assets/views/admin_user.py:78 -#: assets/views/admin_user.py:102 assets/views/asset.py:49 -#: assets/views/asset.py:95 assets/views/asset.py:155 assets/views/asset.py:172 -#: assets/views/asset.py:196 assets/views/domain.py:29 -#: assets/views/domain.py:45 assets/views/domain.py:61 -#: assets/views/domain.py:74 assets/views/domain.py:98 -#: assets/views/domain.py:126 assets/views/domain.py:150 -#: assets/views/label.py:26 assets/views/label.py:42 assets/views/label.py:58 -#: assets/views/system_user.py:28 assets/views/system_user.py:44 -#: assets/views/system_user.py:60 assets/views/system_user.py:74 -#: templates/_nav.html:20 -msgid "Assets" -msgstr "资产管理" - #: assets/templates/assets/_asset_group_bulk_update_modal.html:13 msgid "Select Asset" msgstr "选择资产" #: assets/templates/assets/_asset_group_bulk_update_modal.html:21 +#: assets/templates/assets/user_asset_list.html:48 +#: users/templates/users/user_granted_asset.html:47 msgid "System users" msgstr "系统用户" @@ -569,17 +586,17 @@ msgstr "如果设置了id，则会使用该行信息更新该id的资产" #: assets/templates/assets/_asset_list_modal.html:22 #: assets/templates/assets/asset_list.html:88 -#: assets/templates/assets/user_asset_list.html:22 msgid "Hardware" msgstr "硬件" #: assets/templates/assets/_asset_list_modal.html:23 #: assets/templates/assets/asset_detail.html:143 #: assets/templates/assets/asset_list.html:89 -#: assets/templates/assets/user_asset_list.html:23 perms/models.py:20 -#: perms/models.py:77 -#: perms/templates/perms/asset_permission_create_update.html:51 -#: perms/templates/perms/asset_permission_detail.html:116 +#: assets/templates/assets/user_asset_list.html:47 perms/models.py:25 +#: perms/models.py:70 +#: perms/templates/perms/asset_permission_create_update.html:47 +#: perms/templates/perms/asset_permission_detail.html:120 +#: perms/templates/perms/asset_permission_list.html:59 #: terminal/templates/terminal/terminal_list.html:34 #: users/templates/users/_select_user_modal.html:18 #: users/templates/users/user_detail.html:128 @@ -596,7 +613,6 @@ msgstr "激活中" #: assets/templates/assets/asset_list.html:90 #: assets/templates/assets/system_user_asset.html:52 #: assets/templates/assets/system_user_list.html:30 -#: users/templates/users/user_granted_asset.html:47 #: users/templates/users/user_group_granted_asset.html:47 msgid "Reachable" msgstr "可连接" @@ -610,7 +626,7 @@ msgstr "可连接" #: assets/templates/assets/system_user_list.html:34 #: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:64 #: ops/templates/ops/task_history.html:65 ops/templates/ops/task_list.html:42 -#: perms/templates/perms/asset_permission_list.html:72 +#: perms/templates/perms/asset_permission_list.html:60 #: terminal/templates/terminal/session_list.html:80 #: terminal/templates/terminal/terminal_list.html:36 #: users/templates/users/user_group_list.html:15 @@ -656,7 +672,7 @@ msgstr "激活所选" #: common/templates/common/email_setting.html:60 #: common/templates/common/ldap_setting.html:60 #: common/templates/common/terminal_setting.html:103 -#: perms/templates/perms/asset_permission_create_update.html:72 +#: perms/templates/perms/asset_permission_create_update.html:70 #: terminal/templates/terminal/session_list.html:120 #: terminal/templates/terminal/terminal_update.html:48 #: users/templates/users/_user.html:44 @@ -683,7 +699,7 @@ msgstr "提交" #: assets/templates/assets/system_user_detail.html:26 #: assets/templates/assets/system_user_list.html:88 #: perms/templates/perms/asset_permission_detail.html:30 -#: perms/templates/perms/asset_permission_list.html:121 +#: perms/templates/perms/asset_permission_list.html:191 #: terminal/templates/terminal/terminal_detail.html:16 #: terminal/templates/terminal/terminal_list.html:71 #: users/templates/users/user_detail.html:25 @@ -709,7 +725,7 @@ msgstr "更新" #: assets/templates/assets/system_user_list.html:89 #: ops/templates/ops/task_list.html:72 #: perms/templates/perms/asset_permission_detail.html:34 -#: perms/templates/perms/asset_permission_list.html:122 +#: perms/templates/perms/asset_permission_list.html:192 #: terminal/templates/terminal/terminal_list.html:73 #: users/templates/users/user_detail.html:30 #: users/templates/users/user_group_detail.html:32 @@ -723,7 +739,7 @@ msgstr "删除" #: assets/templates/assets/asset_create.html:16 #: assets/templates/assets/asset_update.html:21 #: assets/templates/assets/gateway_create_update.html:37 -#: perms/templates/perms/asset_permission_create_update.html:38 +#: perms/templates/perms/asset_permission_create_update.html:33 msgid "Basic" msgstr "基本" @@ -745,7 +761,7 @@ msgstr "自动生成密钥" #: assets/templates/assets/asset_create.html:59 #: assets/templates/assets/asset_update.html:63 #: assets/templates/assets/gateway_create_update.html:53 -#: perms/templates/perms/asset_permission_create_update.html:49 +#: perms/templates/perms/asset_permission_create_update.html:45 #: terminal/templates/terminal/terminal_update.html:42 msgid "Other" msgstr "其它" @@ -762,7 +778,7 @@ msgstr "其它" #: common/templates/common/email_setting.html:59 #: common/templates/common/ldap_setting.html:59 #: common/templates/common/terminal_setting.html:101 -#: perms/templates/perms/asset_permission_create_update.html:71 +#: perms/templates/perms/asset_permission_create_update.html:69 #: terminal/templates/terminal/terminal_update.html:47 #: users/templates/users/_user.html:43 #: users/templates/users/user_bulk_update.html:23 @@ -802,7 +818,7 @@ msgstr "资产列表" #: assets/templates/assets/admin_user_assets.html:66 #: assets/templates/assets/system_user_asset.html:64 #: assets/templates/assets/system_user_detail.html:112 -#: perms/templates/perms/asset_permission_detail.html:110 +#: perms/templates/perms/asset_permission_detail.html:114 msgid "Quick update" msgstr "快速更新" @@ -822,9 +838,14 @@ msgstr "测试" msgid "Replace node assets admin user with this" msgstr "替换资产的管理员" +#: assets/templates/assets/admin_user_detail.html:91 +#: perms/templates/perms/asset_permission_asset.html:116 +msgid "Select nodes" +msgstr "选择节点" + #: assets/templates/assets/admin_user_detail.html:100 #: assets/templates/assets/asset_detail.html:200 -#: assets/templates/assets/asset_list.html:600 +#: assets/templates/assets/asset_list.html:603 #: assets/templates/assets/system_user_detail.html:183 #: assets/templates/assets/system_user_list.html:138 templates/_modal.html:16 #: terminal/templates/terminal/session_detail.html:108 @@ -855,19 +876,6 @@ msgstr "不可达" msgid "Ratio" msgstr "比例" -#: assets/templates/assets/asset_create.html:29 -#: assets/templates/assets/asset_update.html:34 perms/models.py:74 -#: perms/templates/perms/asset_permission_create_update.html:40 -#: perms/templates/perms/asset_permission_list.html:67 -msgid "Node" -msgstr "节点" - -#: assets/templates/assets/asset_create.html:35 -#: assets/templates/assets/asset_list.html:75 -#: assets/templates/assets/asset_update.html:40 -msgid "Label" -msgstr "标签" - #: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:197 msgid "Asset detail" msgstr "资产详情" @@ -949,15 +957,15 @@ msgstr "重命名节点" msgid "Delete node" msgstr "删除节点" -#: assets/templates/assets/asset_list.html:203 +#: assets/templates/assets/asset_list.html:202 msgid "Create node failed" msgstr "创建节点失败" -#: assets/templates/assets/asset_list.html:216 +#: assets/templates/assets/asset_list.html:215 msgid "Have child node, cancel" msgstr "存在子节点，不能删除" -#: assets/templates/assets/asset_list.html:595 +#: assets/templates/assets/asset_list.html:598 #: assets/templates/assets/system_user_list.html:133 #: users/templates/users/user_detail.html:334 #: users/templates/users/user_detail.html:359 @@ -966,20 +974,20 @@ msgstr "存在子节点，不能删除" msgid "Are you sure?" msgstr "你确认吗?" -#: assets/templates/assets/asset_list.html:596 +#: assets/templates/assets/asset_list.html:599 msgid "This will delete the selected assets !!!" msgstr "删除选择资产" -#: assets/templates/assets/asset_list.html:604 +#: assets/templates/assets/asset_list.html:607 msgid "Asset Deleted." msgstr "已被删除" -#: assets/templates/assets/asset_list.html:605 -#: assets/templates/assets/asset_list.html:610 +#: assets/templates/assets/asset_list.html:608 +#: assets/templates/assets/asset_list.html:613 msgid "Asset Delete" msgstr "删除" -#: assets/templates/assets/asset_list.html:609 +#: assets/templates/assets/asset_list.html:612 msgid "Asset Deleting failed." msgstr "删除失败" @@ -1088,10 +1096,6 @@ msgstr "删除系统用户" msgid "System Users Deleting failed." msgstr "系统用户删除失败" -#: assets/templates/assets/user_asset_list.html:24 -msgid "Connective" -msgstr "连接性" - #: assets/views/admin_user.py:30 msgid "Admin user list" msgstr "管理用户列表" @@ -1120,7 +1124,7 @@ msgstr "批量更新资产" msgid "Update asset" msgstr "更新资产" -#: assets/views/asset.py:300 +#: assets/views/asset.py:308 msgid "already exists" msgstr "已经存在" @@ -1182,18 +1186,33 @@ msgstr "远端地址" msgid "Operate" msgstr "操作" -#: audits/models.py:14 audits/templates/audits/ftp_log_list.html:76 +#: audits/models.py:14 audits/templates/audits/ftp_log_list.html:56 +#: audits/templates/audits/ftp_log_list.html:76 msgid "Filename" msgstr "文件名" -#: audits/templates/audits/ftp_log_list.html:77 +#: audits/models.py:15 audits/templates/audits/ftp_log_list.html:77 +#: ops/templates/ops/task_list.html:39 +msgid "Success" +msgstr "成功" + +#: audits/templates/audits/ftp_log_list.html:78 #: ops/templates/ops/adhoc_history.html:52 #: ops/templates/ops/adhoc_history_detail.html:61 -#: ops/templates/ops/task_history.html:58 terminal/models.py:132 +#: ops/templates/ops/task_history.html:58 perms/models.py:26 +#: perms/templates/perms/asset_permission_detail.html:86 terminal/models.py:132 #: terminal/templates/terminal/session_list.html:77 msgid "Date start" msgstr "开始日期" +#: audits/views.py:50 templates/_nav.html:64 +msgid "Audits" +msgstr "日志审计" + +#: audits/views.py:51 templates/_nav.html:67 +msgid "FTP log" +msgstr "FTP日志" + #: common/api.py:18 msgid "Test mail sent to {}, please check" msgstr "邮件已经发送{}, 请检查" @@ -1655,10 +1674,6 @@ msgstr "搜索" msgid "Versions" msgstr "版本" -#: ops/templates/ops/task_list.html:39 -msgid "Success" -msgstr "成功" - #: ops/templates/ops/task_list.html:40 #: users/templates/users/login_log_list.html:54 msgid "Date" @@ -1685,24 +1700,37 @@ msgstr "任务列表" msgid "Task run history" msgstr "执行历史" -#: perms/forms.py:22 perms/models.py:16 perms/models.py:75 -#: perms/templates/perms/asset_permission_list.html:68 templates/_nav.html:14 -#: users/models/group.py:25 users/models/user.py:37 +#: perms/forms.py:18 users/forms.py:176 users/forms.py:181 users/forms.py:193 +#: users/forms.py:223 +msgid "Select users" +msgstr "选择用户" + +#: perms/forms.py:34 perms/models.py:21 perms/models.py:68 +#: perms/templates/perms/asset_permission_list.html:55 +#: perms/templates/perms/asset_permission_list.html:136 templates/_nav.html:14 +#: users/models/group.py:25 users/models/user.py:42 #: users/templates/users/_select_user_modal.html:16 #: users/templates/users/user_detail.html:179 #: users/templates/users/user_list.html:26 msgid "User group" msgstr "用户组" -#: perms/models.py:21 perms/models.py:78 -#: perms/templates/perms/asset_permission_detail.html:86 -#: perms/templates/perms/asset_permission_list.html:71 users/models/user.py:49 -#: users/templates/users/user_detail.html:95 +#: perms/forms.py:56 +msgid "User or group at least one required" +msgstr "" + +#: perms/forms.py:65 +msgid "Asset or group at least one required" +msgstr "" + +#: perms/models.py:27 perms/models.py:71 +#: perms/templates/perms/asset_permission_detail.html:90 +#: users/models/user.py:54 users/templates/users/user_detail.html:95 #: users/templates/users/user_profile.html:96 msgid "Date expired" msgstr "失效日期" -#: perms/models.py:88 templates/_nav.html:34 +#: perms/models.py:81 templates/_nav.html:34 msgid "Asset permission" msgstr "资产授权" @@ -1723,7 +1751,7 @@ msgid "Add asset to this permission" msgstr "添加资产" #: perms/templates/perms/asset_permission_asset.html:97 -#: perms/templates/perms/asset_permission_detail.html:153 +#: perms/templates/perms/asset_permission_detail.html:157 #: perms/templates/perms/asset_permission_user.html:97 #: perms/templates/perms/asset_permission_user.html:125 #: users/templates/users/user_group_detail.html:95 @@ -1731,12 +1759,8 @@ msgid "Add" msgstr "添加" #: perms/templates/perms/asset_permission_asset.html:108 -msgid "Add asset group to this permission" -msgstr "添加资产组" - -#: perms/templates/perms/asset_permission_asset.html:116 users/forms.py:275 -msgid "Select asset groups" -msgstr "选择资产组" +msgid "Add node to this permission" +msgstr "添加节点" #: perms/templates/perms/asset_permission_asset.html:125 #: users/templates/users/user_detail.html:196 @@ -1756,18 +1780,18 @@ msgid "Asset count" msgstr "资产数量" #: perms/templates/perms/asset_permission_detail.html:78 -msgid "Asset group count" -msgstr "资产组数量" +msgid "Node count" +msgstr "节点数量" #: perms/templates/perms/asset_permission_detail.html:82 msgid "System user count" msgstr "系统用户数量" -#: perms/templates/perms/asset_permission_detail.html:144 users/forms.py:278 +#: perms/templates/perms/asset_permission_detail.html:148 msgid "Select system users" msgstr "选择系统用户" -#: perms/templates/perms/asset_permission_list.html:58 +#: perms/templates/perms/asset_permission_list.html:46 msgid "Create permission" msgstr "创建授权规则" @@ -1792,22 +1816,31 @@ msgstr "添加用户组" msgid "Select user groups" msgstr "选择用户组" -#: perms/views.py:23 perms/views.py:47 perms/views.py:67 templates/_nav.html:31 +#: perms/views.py:25 perms/views.py:55 perms/views.py:70 perms/views.py:85 +#: perms/views.py:120 perms/views.py:151 templates/_nav.html:31 msgid "Perms" msgstr "权限管理" -#: perms/views.py:24 +#: perms/views.py:26 msgid "Asset permission list" msgstr "资产授权列表" -#: perms/views.py:48 +#: perms/views.py:56 msgid "Create asset permission" msgstr "创建权限规则" -#: perms/views.py:68 +#: perms/views.py:71 perms/views.py:86 msgid "Update asset permission" msgstr "更新资产授权" +#: perms/views.py:121 +msgid "Asset permission user list" +msgstr "资产授权用户列表" + +#: perms/views.py:152 +msgid "Asset permission asset list" +msgstr "资产授权资产列表" + #: templates/_header_bar.html:18 msgid "Supports" msgstr "商业支持" @@ -1816,13 +1849,13 @@ msgstr "商业支持" msgid "Docs" msgstr "文档" -#: templates/_header_bar.html:37 templates/_nav_user.html:9 users/forms.py:94 +#: templates/_header_bar.html:37 templates/_nav_user.html:9 users/forms.py:93 #: users/templates/users/_user.html:36 #: users/templates/users/user_password_update.html:37 #: users/templates/users/user_profile.html:17 #: users/templates/users/user_profile_update.html:37 #: users/templates/users/user_profile_update.html:57 -#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:317 +#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:318 msgid "Profile" msgstr "个人信息" @@ -1879,9 +1912,9 @@ msgstr "关闭" #: templates/_nav.html:10 users/views/group.py:28 users/views/group.py:44 #: users/views/group.py:62 users/views/group.py:79 users/views/group.py:95 -#: users/views/login.py:209 users/views/login.py:258 users/views/user.py:60 -#: users/views/user.py:75 users/views/user.py:94 users/views/user.py:150 -#: users/views/user.py:305 users/views/user.py:352 users/views/user.py:374 +#: users/views/login.py:205 users/views/login.py:254 users/views/user.py:60 +#: users/views/user.py:75 users/views/user.py:95 users/views/user.py:151 +#: users/views/user.py:306 users/views/user.py:353 users/views/user.py:375 msgid "Users" msgstr "用户管理" @@ -1925,14 +1958,6 @@ msgstr "终端管理" msgid "Job Center" msgstr "作业中心" -#: templates/_nav.html:64 -msgid "Audits" -msgstr "日志审计" - -#: templates/_nav.html:67 -msgid "FTP log" -msgstr "FTP日志" - #: templates/captcha/image.html:3 msgid "Play CAPTCHA as audio file" msgstr "语言播放验证码" @@ -2199,7 +2224,7 @@ msgstr "" msgid "Invalid token or cache refreshed." msgstr "" -#: users/forms.py:28 users/models/user.py:38 +#: users/forms.py:27 users/models/user.py:43 #: users/templates/users/_select_user_modal.html:15 #: users/templates/users/user_detail.html:87 #: users/templates/users/user_list.html:25 @@ -2207,55 +2232,55 @@ msgstr "" msgid "Role" msgstr "角色" -#: users/forms.py:30 users/forms.py:140 +#: users/forms.py:29 users/forms.py:139 msgid "ssh public key" msgstr "ssh公钥" -#: users/forms.py:31 users/forms.py:141 +#: users/forms.py:30 users/forms.py:140 msgid "ssh-rsa AAAA..." msgstr "" -#: users/forms.py:32 +#: users/forms.py:31 msgid "Paste user id_rsa.pub here." msgstr "复制用户公钥到这里" -#: users/forms.py:50 users/templates/users/user_detail.html:187 +#: users/forms.py:49 users/templates/users/user_detail.html:187 msgid "Join user groups" msgstr "添加到用户组" -#: users/forms.py:60 users/forms.py:155 +#: users/forms.py:59 users/forms.py:154 msgid "Public key should not be the same as your old one." msgstr "不能和原来的密钥相同" -#: users/forms.py:64 users/forms.py:159 users/serializers.py:42 +#: users/forms.py:63 users/forms.py:158 users/serializers.py:42 msgid "Not a valid ssh public key" msgstr "ssh密钥不合法" -#: users/forms.py:100 +#: users/forms.py:99 msgid "Old password" msgstr "原来密码" -#: users/forms.py:105 +#: users/forms.py:104 msgid "New password" msgstr "新密码" -#: users/forms.py:110 +#: users/forms.py:109 msgid "Confirm password" msgstr "确认密码" -#: users/forms.py:120 +#: users/forms.py:119 msgid "Old password error" msgstr "原来密码错误" -#: users/forms.py:128 +#: users/forms.py:127 msgid "Password does not match" msgstr "密码不一致" -#: users/forms.py:142 +#: users/forms.py:141 msgid "Paste your id_rsa.pub here." msgstr "复制你的公钥到这里" -#: users/forms.py:170 users/models/user.py:46 +#: users/forms.py:169 users/models/user.py:51 #: users/templates/users/user_password_update.html:43 #: users/templates/users/user_profile.html:71 #: users/templates/users/user_profile_update.html:43 @@ -2263,10 +2288,6 @@ msgstr "复制你的公钥到这里" msgid "Public key" msgstr "ssh公钥" -#: users/forms.py:177 users/forms.py:182 users/forms.py:194 users/forms.py:224 -msgid "Select users" -msgstr "选择用户" - #: users/models/authentication.py:36 msgid "Private Token" msgstr "ssh密钥" @@ -2291,7 +2312,7 @@ msgstr "Agent" msgid "Date login" msgstr "登录日期" -#: users/models/user.py:29 users/models/user.py:262 +#: users/models/user.py:29 users/models/user.py:281 msgid "Administrator" msgstr "管理员" @@ -2299,24 +2320,36 @@ msgstr "管理员" msgid "Application" msgstr "应用程序" -#: users/models/user.py:36 users/templates/users/user_detail.html:71 +#: users/models/user.py:34 +msgid "Disable" +msgstr "禁用" + +#: users/models/user.py:35 +msgid "Enable" +msgstr "启用" + +#: users/models/user.py:36 +msgid "Force enable" +msgstr "强制启用" + +#: users/models/user.py:41 users/templates/users/user_detail.html:71 #: users/templates/users/user_profile.html:59 msgid "Email" msgstr "邮件" -#: users/models/user.py:39 +#: users/models/user.py:44 msgid "Avatar" msgstr "头像" -#: users/models/user.py:40 users/templates/users/user_detail.html:82 +#: users/models/user.py:45 users/templates/users/user_detail.html:82 msgid "Wechat" msgstr "微信" -#: users/models/user.py:42 +#: users/models/user.py:47 msgid "Enable OTP" msgstr "二次验证" -#: users/models/user.py:265 +#: users/models/user.py:284 msgid "Administrator is the super user of system" msgstr "Administrator是初始的超级管理员" @@ -2431,7 +2464,7 @@ msgid "Reset link will be generated and sent to the user. " msgstr "生成重置密码连接，通过邮件发送给用户" #: users/templates/users/user_detail.html:19 -#: users/templates/users/user_granted_asset.html:18 users/views/user.py:151 +#: users/templates/users/user_granted_asset.html:18 users/views/user.py:152 msgid "User detail" msgstr "用户详情" @@ -2550,8 +2583,8 @@ msgstr "用户删除失败" msgid "OTP" msgstr "" -#: users/templates/users/user_profile.html:100 users/views/user.py:180 -#: users/views/user.py:234 +#: users/templates/users/user_profile.html:100 users/views/user.py:181 +#: users/views/user.py:235 msgid "User groups" msgstr "用户组" @@ -2587,7 +2620,7 @@ msgstr "更新密钥" msgid "Or reset by server" msgstr "或者重置并下载密钥" -#: users/templates/users/user_update.html:4 users/views/user.py:94 +#: users/templates/users/user_update.html:4 users/views/user.py:95 msgid "Update user" msgstr "更新用户" @@ -2733,78 +2766,76 @@ msgstr "更新用户组" msgid "User group granted asset" msgstr "用户组授权资产" -#: users/views/login.py:57 +#: users/views/login.py:55 msgid "Please enable cookies and try again." msgstr "设置你的浏览器支持cookie" -#: users/views/login.py:99 +#: users/views/login.py:97 msgid "Logout success" msgstr "退出登录成功" -#: users/views/login.py:100 +#: users/views/login.py:98 msgid "Logout success, return login page" msgstr "退出登录成功，返回到登录页面" -#: users/views/login.py:116 +#: users/views/login.py:114 msgid "Email address invalid, please input again" msgstr "邮箱地址错误，重新输入" -#: users/views/login.py:129 +#: users/views/login.py:127 msgid "Send reset password message" msgstr "发送重置密码邮件" -#: users/views/login.py:130 +#: users/views/login.py:128 msgid "Send reset password mail success, login your mail box and follow it " msgstr "" "发送重置邮件成功, 请登录邮箱查看, 按照提示操作 (如果没收到,请等待3-5分钟)" -#: users/views/login.py:144 +#: users/views/login.py:142 msgid "Reset password success" msgstr "重置密码成功" -#: users/views/login.py:145 +#: users/views/login.py:143 msgid "Reset password success, return to login page" msgstr "重置密码成功，返回到登录页面" -#: users/views/login.py:162 users/views/login.py:175 +#: users/views/login.py:160 users/views/login.py:173 msgid "Token invalid or expired" msgstr "Token错误或失效" -#: users/views/login.py:171 +#: users/views/login.py:169 msgid "Password not same" msgstr "密码不一致" -#: users/views/login.py:209 +#: users/views/login.py:205 msgid "First login" msgstr "首次登陆" -#: users/views/login.py:259 +#: users/views/login.py:255 msgid "Login log list" msgstr "登录日志" -#: users/views/user.py:104 +#: users/views/user.py:105 msgid "Bulk update user success" msgstr "批量更新用户成功" -#: users/views/user.py:209 +#: users/views/user.py:210 msgid "Invalid file." msgstr "文件不合法" -#: users/views/user.py:306 +#: users/views/user.py:307 msgid "User granted assets" msgstr "用户授权资产" -#: users/views/user.py:335 +#: users/views/user.py:336 msgid "Profile setting" msgstr "个人信息设置" -#: users/views/user.py:353 +#: users/views/user.py:354 msgid "Password update" msgstr "密码更新" -#: users/views/user.py:375 +#: users/views/user.py:376 msgid "Public key update" msgstr "密钥更新" -#~ msgid "Task has been send, seen left asset status" -#~ msgstr "任务已下发，查看左侧资产状态" diff --git a/apps/perms/api.py b/apps/perms/api.py index 1303e4128..f9b60dcb6 100644 --- a/apps/perms/api.py +++ b/apps/perms/api.py @@ -3,7 +3,7 @@ from django.shortcuts import get_object_or_404 from rest_framework.views import APIView, Response -from rest_framework.generics import ListAPIView, get_object_or_404 +from rest_framework.generics import ListAPIView, get_object_or_404, RetrieveUpdateAPIView from rest_framework import viewsets from common.utils import set_or_append_attr_bulk @@ -246,3 +246,77 @@ class ValidateUserAssetPermissionView(APIView): return Response({'msg': True}, status=200) else: return Response({'msg': False}, status=403) + + +class AssetPermissionRemoveUserApi(RetrieveUpdateAPIView): + """ + 将用户从授权中移除，Detail页面会调用 + """ + permission_classes = (IsSuperUser,) + serializer_class = serializers.AssetPermissionUpdateUserSerializer + queryset = AssetPermission.objects.all() + + def update(self, request, *args, **kwargs): + perm = self.get_object() + serializer = self.serializer_class(data=request.data) + if serializer.is_valid(): + users = serializer.validated_data.get('users') + if users: + perm.users.remove(*tuple(users)) + return Response({"msg": "ok"}) + else: + return Response({"error": serializer.errors}) + + +class AssetPermissionAddUserApi(RetrieveUpdateAPIView): + permission_classes = (IsSuperUser,) + serializer_class = serializers.AssetPermissionUpdateUserSerializer + queryset = AssetPermission.objects.all() + + def update(self, request, *args, **kwargs): + perm = self.get_object() + serializer = self.serializer_class(data=request.data) + if serializer.is_valid(): + users = serializer.validated_data.get('users') + if users: + perm.users.add(*tuple(users)) + return Response({"msg": "ok"}) + else: + return Response({"error": serializer.errors}) + + +class AssetPermissionRemoveAssetApi(RetrieveUpdateAPIView): + """ + 将用户从授权中移除，Detail页面会调用 + """ + permission_classes = (IsSuperUser,) + serializer_class = serializers.AssetPermissionUpdateAssetSerializer + queryset = AssetPermission.objects.all() + + def update(self, request, *args, **kwargs): + perm = self.get_object() + serializer = self.serializer_class(data=request.data) + if serializer.is_valid(): + assets = serializer.validated_data.get('assets') + if assets: + perm.assets.remove(*tuple(assets)) + return Response({"msg": "ok"}) + else: + return Response({"error": serializer.errors}) + + +class AssetPermissionAddAssetApi(RetrieveUpdateAPIView): + permission_classes = (IsSuperUser,) + serializer_class = serializers.AssetPermissionUpdateAssetSerializer + queryset = AssetPermission.objects.all() + + def update(self, request, *args, **kwargs): + perm = self.get_object() + serializer = self.serializer_class(data=request.data) + if serializer.is_valid(): + assets = serializer.validated_data.get('assets') + if assets: + perm.assets.add(*tuple(assets)) + return Response({"msg": "ok"}) + else: + return Response({"error": serializer.errors}) diff --git a/apps/perms/forms.py b/apps/perms/forms.py index 060812d4a..c418160dd 100644 --- a/apps/perms/forms.py +++ b/apps/perms/forms.py @@ -4,10 +4,23 @@ from __future__ import absolute_import, unicode_literals from django import forms from django.utils.translation import ugettext_lazy as _ +from .hands import User from .models import AssetPermission class AssetPermissionForm(forms.ModelForm): + users = forms.ModelMultipleChoiceField( + queryset=User.objects.exclude(role=User.ROLE_APP), + label=_("User"), + widget=forms.SelectMultiple( + attrs={ + 'class': 'select2', + 'data-placeholder': _('Select users') + } + ), + required=False, + ) + class Meta: model = AssetPermission exclude = ( diff --git a/apps/perms/models.py b/apps/perms/models.py index 6609cd8e2..954cbe5f6 100644 --- a/apps/perms/models.py +++ b/apps/perms/models.py @@ -4,7 +4,7 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ from django.utils import timezone -from common.utils import date_expired_default +from common.utils import date_expired_default, set_or_append_attr_bulk class ValidManager(models.Manager): @@ -45,6 +45,22 @@ class AssetPermission(models.Model): return True return False + def get_all_users(self): + users = set(self.users.all()) + for group in self.user_groups.all(): + _users = group.users.all() + set_or_append_attr_bulk(_users, 'inherit', group.name) + users.update(set(_users)) + return users + + def get_all_assets(self): + assets = set(self.assets.all()) + for node in self.nodes.all(): + _assets = node.get_all_assets() + set_or_append_attr_bulk(_assets, 'inherit', node.value) + assets.update(set(_assets)) + return assets + class NodePermission(models.Model): id = models.UUIDField(default=uuid.uuid4, primary_key=True) diff --git a/apps/perms/templates/perms/asset_permission_asset.html b/apps/perms/templates/perms/asset_permission_asset.html index 12369574d..fa50b4eb9 100644 --- a/apps/perms/templates/perms/asset_permission_asset.html +++ b/apps/perms/templates/perms/asset_permission_asset.html @@ -57,12 +57,12 @@ - {% for asset in page_obj %} + {% for asset in object_list %} {{ asset.hostname }} {{ asset.ip }} - + {% endfor %} @@ -105,7 +105,7 @@
- {% trans 'Add asset group to this permission' %} + {% trans 'Add node to this permission' %}
@@ -113,25 +113,25 @@ - {% for asset_group in asset_groups %} + {% for node in asset_permission.nodes.all %} - + {% endfor %} @@ -179,10 +179,10 @@ function removeAssets(assets) { }); } -function updateGroup(groups) { +function updateNodes(nodes) { var the_url = "{% url 'api-perms:asset-permission-detail' pk=asset_permission.id %}"; var body = { - asset_groups: groups + nodes: nodes }; APIUpdateAttr({ url: the_url, @@ -231,17 +231,17 @@ $(document).ready(function () { var assets = [asset_id]; removeAssets(assets) }) -.on('click', '#btn-add-group', function () { +.on('click', '#btn-add-node', function () { if (Object.keys(jumpserver.nodes_selected).length === 0) { return false; } - var groups = $('.bdg_group').map(function() { + var nodes = $('.bdg_group').map(function() { return $(this).data('gid'); }).get(); $.map(jumpserver.nodes_selected, function(group_name, index) { - groups.push(index); + nodes.push(index); $('#opt_' + index).remove(); $('.group_edit tbody').append( '' + @@ -251,17 +251,17 @@ $(document).ready(function () { ) }); - updateGroup(groups); + updateNodes(nodes); }) -.on('click', '.btn-remove-group', function () { +.on('click', '.btn-remove-node', function () { var $this = $(this); var $tr = $this.closest('tr'); - var groups = $('.bdg_group').map(function() { + var nodes = $('.bdg_group').map(function() { if ($(this).data('gid') !== $this.data('gid')){ return $(this).data('gid'); } }).get(); - updateGroup(groups); + updateNodes(nodes); $tr.remove() }) diff --git a/apps/perms/templates/perms/asset_permission_detail.html b/apps/perms/templates/perms/asset_permission_detail.html index 5540ca515..4cfa48de4 100644 --- a/apps/perms/templates/perms/asset_permission_detail.html +++ b/apps/perms/templates/perms/asset_permission_detail.html @@ -15,19 +15,19 @@
- + - + - + - + - - + + - + + + + + - + - + - + - +
- + {% for node in nodes_remain %} + {% endfor %}
- +
{{ asset_group.name }}{{ node.value }} - +
{% trans 'Name' %}:{{ asset_permission.name }}{{ object.name }}
{% trans 'User count' %}:{{ asset_permission.users.count }}{{ object.users.count }}
{% trans 'User group count' %}:{{ asset_permission.users.count }}{{ object.users.count }}
{% trans 'Asset count' %}:{{ asset_permission.assets.count }}{{ object.assets.count }}
{% trans 'Asset group count' %}:{{ asset_permission.asset_groups.count }}{% trans 'Node count' %}:{{ object.nodes.count }}
{% trans 'System user count' %}:{{ asset_permission.system_users.count }}{{ object.system_users.count }}
{% trans 'Date start' %}:{{ object.date_start }}
{% trans 'Date expired' %}:{{ asset_permission.date_expired }}{{ object.date_expired }}
{% trans 'Date created' %}:{{ asset_permission.date_created }}{{ object.date_created }}
{% trans 'Created by' %}:{{ asset_permission.created_by }}{{ object.created_by }}
{% trans 'Comment' %}:{{ asset_permission.comment }}{{ object.comment }}
@@ -117,7 +121,7 @@
- +
- Version 1.0.0-{% include '_build.html' %} GPLv2. + Version 1.2.0-{% include '_build.html' %} GPLv2.
From 2398e9acbdfd5663fb95e8cf2e74743941e650a9 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 12 Apr 2018 10:16:38 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=A1=A8=E6=88=AA?= =?UTF-8?q?=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/users/models/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/users/models/user.py b/apps/users/models/user.py index f0af00a5b..cb8f72674 100644 --- a/apps/users/models/user.py +++ b/apps/users/models/user.py @@ -45,7 +45,7 @@ class User(AbstractUser): wechat = models.CharField(max_length=128, blank=True, verbose_name=_('Wechat')) phone = models.CharField(max_length=20, blank=True, null=True, verbose_name=_('Phone')) otp_level = models.SmallIntegerField(default=0, choices=OTP_LEVEL_CHOICES, verbose_name=_('Enable OTP')) - otp_secret_key = models.CharField(max_length=16, blank=True) + otp_secret_key = models.CharField(max_length=16, blank=True, null=True) # Todo: Auto generate key, let user download _private_key = models.CharField(max_length=5000, blank=True, verbose_name=_('Private key')) _public_key = models.CharField(max_length=5000, blank=True, verbose_name=_('Public key')) From ee4f5a8194798df0cb2566d0444807ea5ae90971 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 12 Apr 2018 11:07:40 +0800 Subject: [PATCH 08/18] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E9=87=8D=E5=A4=8D=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/node.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index 99236f781..9004798b9 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -72,7 +72,7 @@ class Node(models.Model): assets = Asset.objects.all() else: nodes = self.get_family() - assets = Asset.objects.filter(nodes__in=nodes) + assets = Asset.objects.filter(nodes__in=nodes).distinct() return assets def has_assets(self): From 8dfdefd428f60d66f68ceb918e4fe8bb40992fbe Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 12 Apr 2018 17:02:04 +0800 Subject: [PATCH 09/18] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/2018_04_11_migrate_permissions.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/utils/2018_04_11_migrate_permissions.sh b/utils/2018_04_11_migrate_permissions.sh index 3f86ff003..bbc29c388 100644 --- a/utils/2018_04_11_migrate_permissions.sh +++ b/utils/2018_04_11_migrate_permissions.sh @@ -3,6 +3,7 @@ python ../apps/manage.py shell << EOF from perms.models import * +from assets.models import SystemUser for old in NodePermission.objects.all(): perm = AssetPermission.objects.create( @@ -20,5 +21,10 @@ for old in NodePermission.objects.all(): perm.user_groups.add(old.user_group) perm.nodes.add(old.node) perm.system_users.add(old.system_user) + + for s in SystemUser.objects.all(): + nodes = list(s.nodes.all()) + s.nodes.set([]) + s.nodes.set(nodes) EOF From 967800391e97f24d7294c7f94cf18b5175b73a0c Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 12 Apr 2018 17:31:37 +0800 Subject: [PATCH 10/18] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jumpserver/urls.py | 6 ++++-- apps/terminal/api.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py index ced4797d5..e98d17dbc 100644 --- a/apps/jumpserver/urls.py +++ b/apps/jumpserver/urls.py @@ -36,9 +36,11 @@ urlpatterns = [ url(r'^captcha/', include('captcha.urls')), ] +urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) \ + + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + if settings.DEBUG: urlpatterns += [ url(r'^docs/', schema_view, name="docs"), - ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) \ - + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + ] diff --git a/apps/terminal/api.py b/apps/terminal/api.py index 8247ac27c..e625e17bc 100644 --- a/apps/terminal/api.py +++ b/apps/terminal/api.py @@ -248,7 +248,7 @@ class CommandViewSet(viewsets.ViewSet): class SessionReplayViewSet(viewsets.ViewSet): serializer_class = ReplaySerializer - permission_classes = () + permission_classes = (IsSuperUserOrAppUser,) session = None def gen_session_path(self): From 24f144fdc35d89ff2dfda2781b9f8426f05dbe4e Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 12 Apr 2018 18:17:42 +0800 Subject: [PATCH 11/18] =?UTF-8?q?[Bugfix]=20=E4=BF=AE=E5=A4=8D=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E8=B5=84=E4=BA=A7=E6=97=B6url=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/asset.py | 2 +- apps/assets/templates/assets/asset_list.html | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/assets/models/asset.py b/apps/assets/models/asset.py index 96bd598b0..5b3009305 100644 --- a/apps/assets/models/asset.py +++ b/apps/assets/models/asset.py @@ -49,6 +49,7 @@ class Asset(models.Model): ip = models.GenericIPAddressField(max_length=32, verbose_name=_('IP'), db_index=True) hostname = models.CharField(max_length=128, unique=True, verbose_name=_('Hostname')) port = models.IntegerField(default=22, verbose_name=_('Port')) + platform = models.CharField(max_length=128, choices=PLATFORM_CHOICES, default='Linux', verbose_name=_('Platform')) domain = models.ForeignKey("assets.Domain", null=True, blank=True, related_name='assets', verbose_name=_("Domain"), on_delete=models.SET_NULL) nodes = models.ManyToManyField('assets.Node', default=default_node, related_name='assets', verbose_name=_("Nodes")) is_active = models.BooleanField(default=True, verbose_name=_('Is active')) @@ -72,7 +73,6 @@ class Asset(models.Model): disk_total = models.CharField(max_length=1024, null=True, blank=True, verbose_name=_('Disk total')) disk_info = models.CharField(max_length=1024, null=True, blank=True, verbose_name=_('Disk info')) - platform = models.CharField(max_length=128, choices=PLATFORM_CHOICES, default='Linux', verbose_name=_('Platform')) os = models.CharField(max_length=128, null=True, blank=True, verbose_name=_('OS')) os_version = models.CharField(max_length=16, null=True, blank=True, verbose_name=_('OS version')) os_arch = models.CharField(max_length=16, blank=True, null=True, verbose_name=_('OS arch')) diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index 18dc31645..336f4c217 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -459,7 +459,8 @@ $(document).ready(function(){ var current_node; if (nodes && nodes.length ===1 ){ current_node = nodes[0]; - action += "?node_id=" + current_node.id; + action = setUrlParam(action, 'node_id', current_node.id) + {#action += "?node_id=" + current_node.id;#} $form.attr("action", action) } $form.find('.help-block').remove(); From 739932b00521a4b0cbab62cfd837e38d4775c676 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 12 Apr 2018 18:50:43 +0800 Subject: [PATCH 12/18] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/tasks.py | 3 +++ apps/assets/views/asset.py | 18 ++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/apps/assets/tasks.py b/apps/assets/tasks.py index 381e1a4cf..dd660bc42 100644 --- a/apps/assets/tasks.py +++ b/apps/assets/tasks.py @@ -96,6 +96,9 @@ def update_assets_hardware_info_util(assets, task_name=None): task_name = _("更新资产硬件信息") tasks = const.UPDATE_ASSETS_HARDWARE_TASKS hostname_list = [asset.hostname for asset in assets if asset.is_active and asset.is_unixlike()] + if not hostname_list: + logger.info("Not hosts get, may be asset is not active or not unixlike platform") + return {} task, created = update_or_create_ansible_task( task_name, hosts=hostname_list, tasks=tasks, pattern='all', options=const.TASK_OPTIONS, run_as_admin=True, created_by='System', diff --git a/apps/assets/views/asset.py b/apps/assets/views/asset.py index 953f3c8ac..956228f89 100644 --- a/apps/assets/views/asset.py +++ b/apps/assets/views/asset.py @@ -284,24 +284,26 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView): if set(row) == {''}: continue - asset_dict = dict(zip(attr, row)) - id_ = asset_dict.pop('id', 0) - for k, v in asset_dict.items(): + asset_dict_raw = dict(zip(attr, row)) + asset_dict = dict() + for k, v in asset_dict_raw.items(): v = v.strip() if k == 'is_active': - v = True if v in ['TRUE', 1, 'true'] else False + v = False if v in ['False', 0, 'false'] else True elif k == 'admin_user': v = get_object_or_none(AdminUser, name=v) elif k in ['port', 'cpu_count', 'cpu_cores']: try: v = int(v) except ValueError: - v = 0 + v = '' elif k == 'domain': v = get_object_or_none(Domain, name=v) - asset_dict[k] = v - asset = get_object_or_none(Asset, id=id_) if is_uuid(id_) else None + if v != '': + asset_dict[k] = v + + asset = get_object_or_none(Asset, id=asset_dict.pop('id', 0)) if not asset: try: if len(Asset.objects.filter(hostname=asset_dict.get('hostname'))): @@ -316,7 +318,7 @@ class BulkImportAssetView(AdminUserRequiredMixin, JSONResponseMixin, FormView): failed.append('%s: %s' % (asset_dict['hostname'], str(e))) else: for k, v in asset_dict.items(): - if v: + if v != '': setattr(asset, k, v) try: asset.save() From 823e879432db86001656de00633be15a7cee7ac6 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 13 Apr 2018 15:48:10 +0800 Subject: [PATCH 13/18] =?UTF-8?q?[Update]=20=E6=9B=B4=E6=96=B0=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E7=A7=BB=E5=8A=A8=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/api/node.py | 14 ++ .../assets/_add_assets_to_node_modal.html | 7 + .../templates/assets/_asset_list_modal.html | 208 +++++++++--------- apps/assets/templates/assets/asset_list.html | 55 +++-- apps/assets/urls/api_urls.py | 1 + apps/assets/views/asset.py | 1 + apps/jumpserver/urls.py | 5 +- apps/static/js/jumpserver.js | 44 +++- apps/templates/_modal.html | 2 + 9 files changed, 210 insertions(+), 127 deletions(-) create mode 100644 apps/assets/templates/assets/_add_assets_to_node_modal.html diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py index d7499760a..f123e4649 100644 --- a/apps/assets/api/node.py +++ b/apps/assets/api/node.py @@ -32,6 +32,7 @@ __all__ = [ 'NodeViewSet', 'NodeChildrenApi', 'NodeAssetsApi', 'NodeWithAssetsApi', 'NodeAddAssetsApi', 'NodeRemoveAssetsApi', + 'NodeReplaceAssetsApi', 'NodeAddChildrenApi', 'RefreshNodeHardwareInfoApi', 'TestNodeConnectiveApi' ] @@ -191,6 +192,19 @@ class NodeRemoveAssetsApi(generics.UpdateAPIView): instance.assets.remove(*tuple(assets)) +class NodeReplaceAssetsApi(generics.UpdateAPIView): + serializer_class = serializers.NodeAssetsSerializer + queryset = Node.objects.all() + permission_classes = (IsSuperUser,) + instance = None + + def perform_update(self, serializer): + assets = serializer.validated_data.get('assets') + instance = self.get_object() + for asset in assets: + asset.nodes.set([instance]) + + class RefreshNodeHardwareInfoApi(APIView): permission_classes = (IsSuperUser,) model = Node diff --git a/apps/assets/templates/assets/_add_assets_to_node_modal.html b/apps/assets/templates/assets/_add_assets_to_node_modal.html new file mode 100644 index 000000000..31641e722 --- /dev/null +++ b/apps/assets/templates/assets/_add_assets_to_node_modal.html @@ -0,0 +1,7 @@ +{% extends 'assets/_asset_list_modal.html' %} +{% load i18n %} + +{% block modal_button %} + + +{% endblock %} \ No newline at end of file diff --git a/apps/assets/templates/assets/_asset_list_modal.html b/apps/assets/templates/assets/_asset_list_modal.html index b68ab0378..a4f2c7f77 100644 --- a/apps/assets/templates/assets/_asset_list_modal.html +++ b/apps/assets/templates/assets/_asset_list_modal.html @@ -1,132 +1,126 @@ {% extends '_modal.html' %} {% load i18n %} +{% load static %} {% block modal_class %}modal-lg{% endblock %} {% block modal_id %}asset_list_modal{% endblock %} -{#{% block modal_title%}{% trans "Please select assets" %}{% endblock %}#} +{% block modal_title%}{% trans "Asset list" %}{% endblock %} {% block modal_body %} -{#
#} -{# #} -{# #} -{#
#} - - - - - - - - - - - - - - -
{% trans 'Hostname' %}{% trans 'IP' %}{% trans 'Hardware' %}{% trans 'Active' %}{% trans 'Reachable' %}{% trans 'Action' %}
-
-
- -
- + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + +
{% trans 'Hostname' %}{% trans 'IP' %}
+
+ - {% endblock %} -{% block modal_confirm_id %}btn_select_assets{% endblock %} + +{% block modal_button %} + {{ block.super }} +{% endblock %} +{% block modal_confirm_id %}btn_asset_modal_confirm{% endblock %} + diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index 336f4c217..8e3710624 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -130,7 +130,7 @@
{% include 'assets/_asset_import_modal.html' %} -{% include 'assets/_asset_list_modal.html' %} +{% include 'assets/_add_assets_to_node_modal.html' %} {% endblock %} {% block custom_foot_js %} @@ -210,10 +210,11 @@ function removeTreeNode() { if (!current_node){ return } - if (current_node.children && current_node.children.length > 0) { - alert("{% trans 'Have child node, cancel' %}") - } else { + toastr.error("{% trans 'Have child node, cancel' %}"); + } else if (current_node.assets_amount !== 0) { + toastr.error("{% trans 'Have assets, cancel' %}"); + } else { var url = "{% url 'api-assets:node-detail' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", current_node.id ); $.ajax({ url: url, @@ -249,13 +250,6 @@ function OnRightClick(event, treeId, treeNode) { function showRMenu(type, x, y) { $("#rMenu ul").show(); - {#if (type === "root") {#} - {# return#} - {# } else {#} - {# $("#m_del").show();#} - {# $("#m_check").show();#} - {# $("#m_unCheck").show();#} - {# }#} x -= 220; rMenu.css({"top":y+"px", "left":x+"px", "visibility":"visible"}); @@ -459,7 +453,7 @@ $(document).ready(function(){ var current_node; if (nodes && nodes.length ===1 ){ current_node = nodes[0]; - action = setUrlParam(action, 'node_id', current_node.id) + action = setUrlParam(action, 'node_id', current_node.id); {#action += "?node_id=" + current_node.id;#} $form.attr("action", action) } @@ -674,7 +668,42 @@ $(document).ready(function(){ break; } $(".ipt_check_all").prop("checked", false) -}); +}) +.on('click', '.btn-node-update', function () { + var assets_selected = asset_table2.selected; + var current_node; + var nodes = zTree.getSelectedNodes(); + if (nodes && nodes.length === 1) { + current_node = nodes[0] + } else { + return + } + + var data = { + 'assets': assets_selected + }; + var success = function () { + asset_table2.selected = []; + asset_table2.ajax.reload() + }; + + var btn_id = $(this).attr('id'); + var url = ''; + if (btn_id === "btn_move") { + url = "{% url 'api-assets:node-replace-assets' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", current_node.id); + } else { + url = "{% url 'api-assets:node-add-assets' pk=DEFAULT_PK %}".replace("{{ DEFAULT_PK }}", current_node.id); + } + + APIUpdateAttr({ + 'url': url, + 'method': 'PUT', + 'body': JSON.stringify(data), + 'success': success + }) +}).on('hidden.bs.modal', '#asset_list_modal', function () { + window.location.reload(); +}) {% endblock %} \ No newline at end of file diff --git a/apps/assets/urls/api_urls.py b/apps/assets/urls/api_urls.py index c4925059a..4429d0f24 100644 --- a/apps/assets/urls/api_urls.py +++ b/apps/assets/urls/api_urls.py @@ -40,6 +40,7 @@ urlpatterns = [ url(r'^v1/nodes/(?P[0-9a-zA-Z\-]{36})/children/add/$', api.NodeAddChildrenApi.as_view(), name='node-add-children'), url(r'^v1/nodes/(?P[0-9a-zA-Z\-]{36})/assets/$', api.NodeAssetsApi.as_view(), name='node-assets'), url(r'^v1/nodes/(?P[0-9a-zA-Z\-]{36})/assets/add/$', api.NodeAddAssetsApi.as_view(), name='node-add-assets'), + url(r'^v1/nodes/(?P[0-9a-zA-Z\-]{36})/assets/replace/$', api.NodeReplaceAssetsApi.as_view(), name='node-replace-assets'), url(r'^v1/nodes/(?P[0-9a-zA-Z\-]{36})/assets/remove/$', api.NodeRemoveAssetsApi.as_view(), name='node-remove-assets'), url(r'^v1/nodes/(?P[0-9a-zA-Z\-]{36})/refresh-hardware-info/$', api.RefreshNodeHardwareInfoApi.as_view(), name='node-refresh-hardware-info'), url(r'^v1/nodes/(?P[0-9a-zA-Z\-]{36})/test-connective/$', api.TestNodeConnectiveApi.as_view(), name='node-test-connective'), diff --git a/apps/assets/views/asset.py b/apps/assets/views/asset.py index 956228f89..306a26a0a 100644 --- a/apps/assets/views/asset.py +++ b/apps/assets/views/asset.py @@ -49,6 +49,7 @@ class AssetListView(AdminUserRequiredMixin, TemplateView): 'app': _('Assets'), 'action': _('Asset list'), 'labels': Label.objects.all().order_by('name'), + 'nodes': Node.objects.all().order_by('-key'), } kwargs.update(context) return super().get_context_data(**kwargs) diff --git a/apps/jumpserver/urls.py b/apps/jumpserver/urls.py index e98d17dbc..e8a490bf3 100644 --- a/apps/jumpserver/urls.py +++ b/apps/jumpserver/urls.py @@ -36,11 +36,12 @@ urlpatterns = [ url(r'^captcha/', include('captcha.urls')), ] -urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) \ - + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) +urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) if settings.DEBUG: urlpatterns += [ url(r'^docs/', schema_view, name="docs"), ] +if not settings.DEBUG: + urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js index f2f8b8f55..461455085 100644 --- a/apps/static/js/jumpserver.js +++ b/apps/static/js/jumpserver.js @@ -307,7 +307,7 @@ jumpserver.initDataTable = function (options) { last: "»" } }, - lengthMenu: [[15, 25, 50, -1], [15, 25, 50, "All"]] + lengthMenu: [[10, 15, 25, 50, -1], [10, 15, 25, 50, "All"]] }); table.on('select', function(e, dt, type, indexes) { var $node = table[ type ]( indexes ).nodes().to$(); @@ -446,22 +446,56 @@ jumpserver.initServerSideDataTable = function (options) { last: "»" } }, - lengthMenu: [[15, 25, 50], [15, 25, 50]] + lengthMenu: [[10, 15, 25, 50], [10, 15, 25, 50]] }); + table.selected = []; table.on('select', function(e, dt, type, indexes) { var $node = table[ type ]( indexes ).nodes().to$(); $node.find('input.ipt_check').prop('checked', true); - jumpserver.selected[$node.find('input.ipt_check').prop('id')] = true + jumpserver.selected[$node.find('input.ipt_check').prop('id')] = true; + if (type === 'row') { + var rows = table.rows(indexes).data(); + $.each(rows, function (id, row) { + if (row.id){ + table.selected.push(row.id) + } + }) + } }).on('deselect', function(e, dt, type, indexes) { var $node = table[ type ]( indexes ).nodes().to$(); $node.find('input.ipt_check').prop('checked', false); - jumpserver.selected[$node.find('input.ipt_check').prop('id')] = false + jumpserver.selected[$node.find('input.ipt_check').prop('id')] = false; + if (type === 'row') { + var rows = table.rows(indexes).data(); + $.each(rows, function (id, row) { + if (row.id){ + var index = table.selected.indexOf(row.id); + if (index > -1){ + table.selected.splice(index, 1) + } + } + }) + } }). on('draw', function(){ $('#op').html(options.op_html || ''); $('#uc').html(options.uc_html || ''); + var table_data = []; + $.each(table.rows().data(), function (id, row) { + if (row.id) { + table_data.push(row.id) + } + }); + + $.each(table.selected, function (id, data) { + var index = table_data.indexOf(data); + if (index > -1){ + table.rows(index).select() + } + }); }); - $('.ipt_check_all').on('click', function() { + var table_id = table.settings()[0].sTableId; + $('#' + table_id + ' .ipt_check_all').on('click', function() { if ($(this).prop("checked")) { $(this).closest('table').find('.ipt_check').prop('checked', true); table.rows({search:'applied', page:'current'}).select(); diff --git a/apps/templates/_modal.html b/apps/templates/_modal.html index ad7f21ccc..7705b8660 100644 --- a/apps/templates/_modal.html +++ b/apps/templates/_modal.html @@ -12,8 +12,10 @@ {% endblock %}
+ {% block modal_button %} + {% endblock %}
From 071d14c6390f093f54e0a582c49b61e8c8247508 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 13 Apr 2018 21:26:10 +0800 Subject: [PATCH 14/18] =?UTF-8?q?[Update]=20=E4=BF=AE=E6=94=B9=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E8=8E=B7=E5=8F=96select?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/assets/models/node.py | 4 +- .../assets/_add_assets_to_node_modal.html | 7 - .../templates/assets/_asset_list_modal.html | 3 +- .../assets/templates/assets/asset_detail.html | 4 +- apps/assets/templates/assets/asset_list.html | 123 ++--- .../assets/domain_create_update.html | 19 +- .../templates/assets/label_create_update.html | 24 +- apps/i18n/zh/LC_MESSAGES/django.mo | Bin 30648 -> 30779 bytes apps/i18n/zh/LC_MESSAGES/django.po | 492 +++++++++--------- .../perms/asset_permission_create_update.html | 45 +- apps/templates/_modal.html | 5 + apps/templates/_nav.html | 2 +- 12 files changed, 389 insertions(+), 339 deletions(-) delete mode 100644 apps/assets/templates/assets/_add_assets_to_node_modal.html diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py index 9004798b9..ad806342b 100644 --- a/apps/assets/models/node.py +++ b/apps/assets/models/node.py @@ -19,7 +19,7 @@ class Node(models.Model): is_asset = False def __str__(self): - return self.value + return self.full_value @property def name(self): @@ -30,7 +30,7 @@ class Node(models.Model): if self == self.__class__.root(): return self.value else: - return '{}/{}'.format(self.value, self.parent.full_value) + return '{} / {}'.format(self.parent.full_value, self.value) @property def level(self): diff --git a/apps/assets/templates/assets/_add_assets_to_node_modal.html b/apps/assets/templates/assets/_add_assets_to_node_modal.html deleted file mode 100644 index 31641e722..000000000 --- a/apps/assets/templates/assets/_add_assets_to_node_modal.html +++ /dev/null @@ -1,7 +0,0 @@ -{% extends 'assets/_asset_list_modal.html' %} -{% load i18n %} - -{% block modal_button %} - - -{% endblock %} \ No newline at end of file diff --git a/apps/assets/templates/assets/_asset_list_modal.html b/apps/assets/templates/assets/_asset_list_modal.html index a4f2c7f77..c5cd48857 100644 --- a/apps/assets/templates/assets/_asset_list_modal.html +++ b/apps/assets/templates/assets/_asset_list_modal.html @@ -14,6 +14,7 @@ padding: 10px 10px; text-align: center; } + #assetTree2.ztree * { background-color: #f8fafb; } @@ -97,9 +98,7 @@ function initTree2() { $.get("{% url 'api-assets:node-list' %}", function(data, status){ $.each(data, function (index, value) { value["pId"] = value["parent"]; - {#if (value["key"] === "0") {#} value["open"] = true; - {# }#} value["name"] = value["value"] + ' (' + value['assets_amount'] + ')'; value['value'] = value['value']; }); diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html index fd57d9643..0b1b2865a 100644 --- a/apps/assets/templates/assets/asset_detail.html +++ b/apps/assets/templates/assets/asset_detail.html @@ -305,9 +305,9 @@ $(document).ready(function () { success_message: success }); if (status === "False") { - $(".ibox-content > table > tbody > tr:nth-child(13) > td:last >b").html('True'); + $(".ibox-content > table > tbody > tr:nth-child(13) > td:last >b").html('True'); }else{ - $(".ibox-content > table > tbody > tr:nth-child(13) > td:last >b").html('False'); + $(".ibox-content > table > tbody > tr:nth-child(13) > td:last >b").html('False'); } }).on('click', '#btn-update-nodes', function () { if (Object.keys(jumpserver.nodes_selected).length === 0) { diff --git a/apps/assets/templates/assets/asset_list.html b/apps/assets/templates/assets/asset_list.html index 8e3710624..04ba11e57 100644 --- a/apps/assets/templates/assets/asset_list.html +++ b/apps/assets/templates/assets/asset_list.html @@ -59,57 +59,57 @@
-
-
{% trans "Create asset" %}
-
-
- - {% trans "Import" %} - - - {% trans "Export" %} - -
-
-
- - +
+
{% trans "Create asset" %}
+
+
+ + {% trans "Import" %} + + + {% trans "Export" %} +
- - - - - - - - - - - - - - -
{% trans 'Hostname' %}{% trans 'IP' %}{% trans 'Hardware' %}{% trans 'Active' %}{% trans 'Reachable' %}{% trans 'Action' %}
-
-
- -
- -
+
+
+ + +
+ + + + + + + + + + + + + + +
{% trans 'Hostname' %}{% trans 'IP' %}{% trans 'Hardware' %}{% trans 'Active' %}{% trans 'Reachable' %}{% trans 'Action' %}
+
+
+ +
+
+
@@ -117,25 +117,27 @@ {% include 'assets/_asset_import_modal.html' %} -{% include 'assets/_add_assets_to_node_modal.html' %} +{% include 'assets/_asset_list_modal.html' %} {% endblock %} {% block custom_foot_js %} diff --git a/apps/assets/templates/assets/domain_create_update.html b/apps/assets/templates/assets/domain_create_update.html index 36ca40fc1..3ad8724e9 100644 --- a/apps/assets/templates/assets/domain_create_update.html +++ b/apps/assets/templates/assets/domain_create_update.html @@ -18,14 +18,25 @@
+{% include 'assets/_asset_list_modal.html' %} {% endblock %} {% block custom_foot_js %} {% endblock %} \ No newline at end of file diff --git a/apps/assets/templates/assets/label_create_update.html b/apps/assets/templates/assets/label_create_update.html index 358faaab8..b26ec6464 100644 --- a/apps/assets/templates/assets/label_create_update.html +++ b/apps/assets/templates/assets/label_create_update.html @@ -3,6 +3,8 @@ {% load bootstrap3 %} {% load i18n %} + + {% block form %}
{% csrf_token %} @@ -18,14 +20,28 @@
+{% include 'assets/_asset_list_modal.html' %} {% endblock %} {% block custom_foot_js %} {% endblock %} \ No newline at end of file diff --git a/apps/i18n/zh/LC_MESSAGES/django.mo b/apps/i18n/zh/LC_MESSAGES/django.mo index 1d2577577a73c75a8ad2ee49c5b55cd99680e7b3..a343d985af7dfd3579a03d47852c15e6b2e7ed68 100644 GIT binary patch delta 10825 zcmZA72YgT08^`gB3|ov?p&3>ZMC_WeN9`iD31T(G-gT8yTQ#UvY6c}m)SjhgTUv^0 zQG0X{HLCyq+yCdA`}n{5>V5U`e$I2xJ?GqW@9&rJ>aK?w_CCtsUd`jPz~OkF!EuV< z`CN{(GNa?n3Rcx|0wNt}2Ij_zxD3zHw`gg{`4H2}(55~&%5eg*S2@SgrDL!bF2-=Y zXgbl3<3~FJna_2iN&G3auoLagE|`mYFU*9)PzxM|d2l{v#$*h_Etn0zu=*toqkSE9 zolkiJLs9dU!~o`ZqDb;lh{3Gb&g_o4X%9dxWIX1;Sr~y!&=-#)H}9N6E#L*_Mc)cu z|3avVOQHIg!R%N8b27gZLy{j`q6Uc92^@mzI1x4RY&*Xcwa{c#zipTW52N~@#sIv8 z+L`;PN8?-3aSCG)>Jd~yw*W~k5>4D5HE^7DNIxrDP^#7UVET@r z7JSOiUqWs9HPrQYQRAgmWd942WUAyn<07aIA!ejm$*hff=1ou&w?Pfu0riM_*!jW8 z`{s;6-M|La!ctKEx10MavHy)I9HpSG%U0PNs32;haMT6mQFm0$+Ko|L-wL(W-7p^} zqIU8f)OGKn##w}V6f048z8^K;8J9$l;0M&5KS53O7ixm+RlJTtn1^;aYJeKnZh@Mx zht(5Mk8lEN0n3K|p%&n7CD95GSm8Ko!1JgJe?$$KX8wul?_bqhNC0Z0 zFw`T6#JpG?^@v(x`nzT4>hm9Jg|et;QVq40jZg!|TD==;hu%c(&|uWS zV^KRX84KVCsCVTP?1G=6J`KUuy+_sxwSYKuHQ+!J4Kx(BfN`ihnueNa4)P3*axu|g$q9$IAn)j0$?7t@3PC*y$K`rEg`5S60|3uwk z)|%deUO^2Mj(Sv;tQ}+RW~d2bQIE84)3Gx zbTMjzwWxREW7L9DQ9E-4^{6hQ?)*CHx;v-^KDP6JqZXE>w%5!n@O+j}!(_Dbs>J`@BZ0@xBVboTiF)yLE_&Vwa(ohpR4ZN-PM@?J^^=T=I z8ozo2_FpHO*opS2mGwt0Yy|53H1xp*s7J5_`Oit^54~i+qh88<4ZVTOpdL|m)Pm}n zZBPsCf!fi*uAP{ITG@Qmovp`2+=@dmw2?Pp66*X?^u;w;3OAx&wr|h}ub>~^KrQ4x zrtb{u**lHBer^Pb28=>oP!+Y1+NhW2b<{KMhuWE`sJHiha}8>zcA#Fylc*iLjOu?E z_0If;rLj~K?@_n)be*mwy09r%*G#ORx?4<4n{eO2VxA{4XNWOSKyHjP_ZF)0mO=SN~i6lGDLv8JH)J~*W`w;3Go<;45 zPYZ9rLa6>_Pz$Pwx~>W8PCJ=BF$?Vhs5>8y>OZCh`=5hk3I*Lk5^6ykPy_5j-O(Y; zir-@nyo2%h#Oj?|dIQFzt{;M0@I=(hyd8D@3DmoC4zlU%L5fr3#h zE{&S7GUmkkR(~C}rCm@9OhgSh12y3?%#2%5FY#{F4IV^|^R3lyxg>gq4^VfUW*uIj z2Fl#p8>k3or(MFVfVwUQL$ML^UON3y6Ku2dhjB9P6IO5DhQDcN;5Q;1L*3o*I?tb^ zSX;;WoD=JCF($O=bJ0d6mu^Yr2h%jom{u}6FZ-yvsW*ST1Z*cLaST5uC-gDs{z{EiGHY;X@qt7 zz+7&wMGd&g+PhJ2`5~*HM2&X=wZQwRFRqMTyc_g01I)r*`26e6i&M}Fqs+?Ip(bj} z8d*IS`TM8S)!OsTrRFMg0}i6!7Sw`*yLt<+V8)>4Yu=UpSJKuBovcHgIS93Yaj1pP zG#8+*TY;Kjow*yeLtj|?JJfYQTm6}tshig?z$MWDMa^ilzIBL2Eua@_pkb)*iMOmi z#p(+%eL<)NtTR*1L*|#L`7T@A{l$_$Py_gP_Xfy`Y6qd-_At~!qOD#BHBn=;oz>&a zeyIM5)^<_-rR1$E(GYoE6Bm#`G|Yu5Jf;Vm#H>Z>;p_41ZNP1F>1 z1F;x@T~YNx<~a1z&;Mywn44bUyW3oi8h9gW>-V7sIELE7bEx_q)I^WW=cs;vnc3pJ zc0scQs(%Hwnct~qg+{2KQZ20A0fT6F$5(J1YTzYU4U;hxucH=}si${7KWbsc%(AE* zt%{nsF>0Qc=w>A8NFuvn6m~b~U>(}~&A+e@?U-KPKYX1qDnbWzvO!bn_!`q^;`HQrU!Jh#iL6cFRhK1I4ldZ!Z^SF85 zypFo?SJX4h(AS$FH);U|Q40*SdO6ffTgBS1n;p#_sPXz@G2TCCEQtnKj+)?Ob1&){ zoks1%EmXfhP!ss~^DKs{$DkiJw{~09bv>*-67^}BjOw=*v*`1`DLvtDFygUtn`*`L?wWCq}YoV@hVD&f5-gbTnX3^(=G>PtXlATzJx^NZh zbN{K;&!Z;z-n@s}v8Sf*0B@W?)B>V#GFC=ix7$2s=g*<50WOp1$La&?5c;OKfGCWl zUKh2%1k}J&%vojrG4JKWep9j%>Uj<}o|}CF*Uz zjOzEu>Q7PqGbVaFlm#_U5!4O45mu;Yg;uDo>}QTM=b$cJX{KN)+Ivy&$W5!~9PITA zGQ%+^=PP3_Y=Bx&J5Sf?Orn8%nu+Fkb2{pRh1UMi+=%)-@3iyZq3-BMJO2W8BYs1? zZ@fYnOgj?wsd^2=^!e{kQkKFj)ECPh)Ib+d13W~nJmXOB9}eKfU$FL1cK&zNBmNsR>GSV9%==4c7Suq2sDXk}6PGlrU>@3yP!n{tdLOHg zwEA>&p}E@JV(vFjp&P+K7p;(if8NjpIZ+dYno+2Q)Icq;nb{t-(C%g*b0F&a;i&Q6 zMqNK2GvgZ6IGcyF|JsV36asKRPQb5F1GE_7*$Fj3U#yO!Py=s64fMI4KVx3QKz z?K{$T7Bz0LS!N{ruYs#sp(&~ziyEMhwa1&YP!ldg4YUrmkW@Q=3^UQbfa-S{wL`a1 z{eLolx4N%8%IlCFbwOTh7sb-Fi=$r7)~Ep{m@{z^?M0~T%8%wpGiJ~qc9g_MwDs24 zBd*%H8RQQLja#%XfBedc9mFZ}`9x>(Yea*j{lP(QTe4EbTFz`ieZ4Hh@q~^<52vKH z^WjHCUh4c>mHr#!J?kUN6MBf>(5Jf!9JPtfvY(gSWvUWoXFxI#>$b^!}x9$ZOG zwJW2@>k$L2-H&`I`A0-)@_iVLI({R5NY8jbYLF}-#&MFrkvapDx`qb1@6&pPIO}zD z#**JAzd;Nle+xGet;t>D61k3YDneL?qKeFYb>c%J&3gD-eWQ7f`jVv3Vg))rC7VQbB2kghU$~ChRVi46$VUA=s~sUvAYXvb zh);?BL~&}fi8aJd;!)DPVg=k(&b&POkbg{ECK8ASFHex)A$AfMUe@p|Z5>tcN8*&V zRoiWOb@N*c(+Q5--gU7D<2#aAq9ySj=Qmj&{oe7I zxM%G@$&-k7v?mj*$%kTp{F10do_am{MSV1u(k(+!g@f&$}>zLbo8yjpE_WC(B$mfyQ zx3({yAR1Hu!)oFPc908z_dIS)&zWEUvaRDSEJpm7d^UcX zUggtG?n~&XU^XIOOMZjsK>h}im6%G~A4BjyF^16bHc{5{H5f*;rM5v|-YeCEql$;~ zF15VGKaYj9n^4$8bRvGDT>v{1lZi=0II)UIv}@lX|AwefJDw;*RJC)x&9a<#y3#0t zF+?Z|5Vv(?Ik^okqQD?TB$W3?!sJc%RYL;lrwO06q-{VRr)uUfrA)ztoNviawC z?(E!qd&WoiK7Hrbp5)upw%nUB>F%W6sWUpv$Q U&Grero6J?~|9#cs_~1PM1L5KGUjP6A delta 10702 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 diff --git a/apps/i18n/zh/LC_MESSAGES/django.po b/apps/i18n/zh/LC_MESSAGES/django.po index 27c978fcd..5c559f24e 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-04-11 15:13+0800\n" +"POT-Creation-Date: 2018-04-13 17:27+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: ibuler \n" "Language-Team: Jumpserver team\n" @@ -17,19 +17,19 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: assets/api/node.py:87 +#: assets/api/node.py:88 msgid "New node {}" msgstr "新节点 {}" -#: assets/api/node.py:202 +#: assets/api/node.py:216 msgid "更新节点资产硬件信息: {}" msgstr "" -#: assets/api/node.py:215 +#: assets/api/node.py:229 msgid "测试节点下资产是否可连接: {}" msgstr "" -#: assets/forms/asset.py:24 assets/models/asset.py:53 assets/models/user.py:103 +#: assets/forms/asset.py:24 assets/models/asset.py:54 assets/models/user.py:103 #: assets/templates/assets/asset_detail.html:183 #: assets/templates/assets/asset_detail.html:191 #: assets/templates/assets/system_user_detail.html:166 perms/models.py:23 @@ -37,7 +37,7 @@ msgid "Nodes" msgstr "节点管理" #: assets/forms/asset.py:27 assets/forms/asset.py:66 assets/forms/asset.py:109 -#: assets/forms/asset.py:113 assets/models/asset.py:57 +#: assets/forms/asset.py:113 assets/models/asset.py:58 #: assets/models/cluster.py:19 assets/models/user.py:72 #: assets/templates/assets/asset_detail.html:73 templates/_nav.html:25 msgid "Admin user" @@ -53,7 +53,7 @@ msgstr "管理用户" msgid "Label" msgstr "标签" -#: assets/forms/asset.py:34 assets/forms/asset.py:73 assets/models/asset.py:52 +#: assets/forms/asset.py:34 assets/forms/asset.py:73 assets/models/asset.py:53 #: assets/models/domain.py:46 msgid "Domain" msgstr "网域" @@ -201,7 +201,7 @@ msgid "" msgstr "高优先级的系统用户将会作为默认登录用户" #: assets/models/asset.py:49 assets/models/domain.py:43 -#: assets/templates/assets/_asset_list_modal.html:21 +#: assets/templates/assets/_asset_list_modal.html:46 #: assets/templates/assets/admin_user_assets.html:52 #: assets/templates/assets/asset_detail.html:61 #: assets/templates/assets/asset_list.html:87 @@ -215,7 +215,7 @@ msgstr "高优先级的系统用户将会作为默认登录用户" msgid "IP" msgstr "IP" -#: assets/models/asset.py:50 assets/templates/assets/_asset_list_modal.html:20 +#: assets/models/asset.py:50 assets/templates/assets/_asset_list_modal.html:45 #: assets/templates/assets/admin_user_assets.html:51 #: assets/templates/assets/asset_detail.html:57 #: assets/templates/assets/asset_list.html:86 @@ -227,59 +227,59 @@ msgstr "IP" msgid "Hostname" msgstr "主机名" -#: assets/models/asset.py:54 assets/models/domain.py:48 +#: assets/models/asset.py:52 assets/templates/assets/asset_detail.html:97 +msgid "Platform" +msgstr "系统平台" + +#: assets/models/asset.py:55 assets/models/domain.py:48 #: assets/models/label.py:20 assets/templates/assets/asset_detail.html:105 msgid "Is active" msgstr "激活" -#: assets/models/asset.py:60 assets/templates/assets/asset_detail.html:65 +#: assets/models/asset.py:61 assets/templates/assets/asset_detail.html:65 msgid "Public IP" msgstr "公网IP" -#: assets/models/asset.py:61 assets/templates/assets/asset_detail.html:113 +#: assets/models/asset.py:62 assets/templates/assets/asset_detail.html:113 msgid "Asset number" msgstr "资产编号" -#: assets/models/asset.py:64 assets/templates/assets/asset_detail.html:77 +#: assets/models/asset.py:65 assets/templates/assets/asset_detail.html:77 msgid "Vendor" msgstr "制造商" -#: assets/models/asset.py:65 assets/templates/assets/asset_detail.html:81 +#: assets/models/asset.py:66 assets/templates/assets/asset_detail.html:81 msgid "Model" msgstr "型号" -#: assets/models/asset.py:66 assets/templates/assets/asset_detail.html:109 +#: assets/models/asset.py:67 assets/templates/assets/asset_detail.html:109 msgid "Serial number" msgstr "序列号" -#: assets/models/asset.py:68 +#: assets/models/asset.py:69 msgid "CPU model" msgstr "CPU型号" -#: assets/models/asset.py:69 +#: assets/models/asset.py:70 msgid "CPU count" msgstr "CPU数量" -#: assets/models/asset.py:70 +#: assets/models/asset.py:71 msgid "CPU cores" msgstr "CPU核数" -#: assets/models/asset.py:71 assets/templates/assets/asset_detail.html:89 +#: assets/models/asset.py:72 assets/templates/assets/asset_detail.html:89 msgid "Memory" msgstr "内存" -#: assets/models/asset.py:72 +#: assets/models/asset.py:73 msgid "Disk total" msgstr "硬盘大小" -#: assets/models/asset.py:73 +#: assets/models/asset.py:74 msgid "Disk info" msgstr "硬盘信息" -#: assets/models/asset.py:75 assets/templates/assets/asset_detail.html:97 -msgid "Platform" -msgstr "系统平台" - #: assets/models/asset.py:76 assets/templates/assets/asset_detail.html:101 msgid "OS" msgstr "操作系统" @@ -454,8 +454,8 @@ msgstr "" #: assets/views/admin_user.py:29 assets/views/admin_user.py:47 #: assets/views/admin_user.py:63 assets/views/admin_user.py:78 #: assets/views/admin_user.py:102 assets/views/asset.py:49 -#: assets/views/asset.py:95 assets/views/asset.py:155 assets/views/asset.py:172 -#: assets/views/asset.py:196 assets/views/domain.py:29 +#: assets/views/asset.py:96 assets/views/asset.py:156 assets/views/asset.py:173 +#: assets/views/asset.py:197 assets/views/domain.py:29 #: assets/views/domain.py:45 assets/views/domain.py:61 #: assets/views/domain.py:74 assets/views/domain.py:98 #: assets/views/domain.py:126 assets/views/domain.py:150 @@ -504,38 +504,66 @@ msgstr "系统用户" msgid "%(value)s is not an even number" msgstr "%(value)s is not an even number" -#: assets/tasks.py:96 assets/tasks.py:113 +#: assets/tasks.py:96 assets/tasks.py:116 msgid "更新资产硬件信息" msgstr "" -#: assets/tasks.py:132 +#: assets/tasks.py:135 msgid "定期更新资产硬件信息" msgstr "" -#: assets/tasks.py:210 +#: assets/tasks.py:213 msgid "定期测试管理账号可连接性: {}" msgstr "" -#: assets/tasks.py:217 +#: assets/tasks.py:220 msgid "测试管理行号可连接性: {}" msgstr "" -#: assets/tasks.py:227 +#: assets/tasks.py:230 msgid "测试资产可连接性" msgstr "" -#: assets/tasks.py:297 +#: assets/tasks.py:300 msgid "Test system user connectability: {}" msgstr "测试系统用户可连接性: {}" -#: assets/tasks.py:313 +#: assets/tasks.py:316 msgid "定期测试系统用户可连接性: {}" msgstr "" -#: assets/tasks.py:398 +#: assets/tasks.py:401 msgid "推送系统用户到入资产: {}" msgstr "" +#: assets/templates/assets/_admin_user_setting_modal.html:4 +#: users/templates/users/reset_password.html:57 +#: users/templates/users/user_profile.html:20 +msgid "Setting" +msgstr "设置" + +#: assets/templates/assets/_admin_user_setting_modal.html:9 +#: assets/templates/assets/_asset_import_modal.html:9 +#: users/templates/users/_user_import_modal.html:10 +msgid "Template" +msgstr "模板" + +#: assets/templates/assets/_admin_user_setting_modal.html:10 +#: assets/templates/assets/_asset_import_modal.html:10 +#: users/templates/users/_user_import_modal.html:11 +msgid "Download" +msgstr "下载" + +#: assets/templates/assets/_admin_user_setting_modal.html:13 +#: assets/templates/assets/_asset_import_modal.html:13 +msgid "Asset csv file" +msgstr "资产csv文件" + +#: assets/templates/assets/_admin_user_setting_modal.html:16 +#: assets/templates/assets/_asset_import_modal.html:16 +msgid "If set id, will use this id update asset existed" +msgstr "如果设置了id，则会使用该行信息更新该id的资产" + #: assets/templates/assets/_asset_group_bulk_update_modal.html:5 msgid "Update asset group" msgstr "更新用户组" @@ -566,174 +594,10 @@ msgstr "二次验证" msgid "Import asset" msgstr "导入资产" -#: assets/templates/assets/_asset_import_modal.html:9 -#: users/templates/users/_user_import_modal.html:10 -msgid "Template" -msgstr "模板" - -#: assets/templates/assets/_asset_import_modal.html:10 -#: users/templates/users/_user_import_modal.html:11 -msgid "Download" -msgstr "下载" - -#: assets/templates/assets/_asset_import_modal.html:13 -msgid "Asset csv file" -msgstr "资产csv文件" - -#: assets/templates/assets/_asset_import_modal.html:16 -msgid "If set id, will use this id update asset existed" -msgstr "如果设置了id，则会使用该行信息更新该id的资产" - -#: assets/templates/assets/_asset_list_modal.html:22 -#: assets/templates/assets/asset_list.html:88 -msgid "Hardware" -msgstr "硬件" - -#: assets/templates/assets/_asset_list_modal.html:23 -#: assets/templates/assets/asset_detail.html:143 -#: assets/templates/assets/asset_list.html:89 -#: assets/templates/assets/user_asset_list.html:47 perms/models.py:25 -#: perms/models.py:70 -#: perms/templates/perms/asset_permission_create_update.html:47 -#: perms/templates/perms/asset_permission_detail.html:120 -#: perms/templates/perms/asset_permission_list.html:59 -#: terminal/templates/terminal/terminal_list.html:34 -#: users/templates/users/_select_user_modal.html:18 -#: users/templates/users/user_detail.html:128 -#: users/templates/users/user_granted_asset.html:46 -#: users/templates/users/user_group_granted_asset.html:46 -#: users/templates/users/user_list.html:27 -#: users/templates/users/user_profile.html:63 -msgid "Active" -msgstr "激活中" - -#: assets/templates/assets/_asset_list_modal.html:24 -#: assets/templates/assets/admin_user_assets.html:54 -#: assets/templates/assets/admin_user_list.html:26 -#: assets/templates/assets/asset_list.html:90 -#: assets/templates/assets/system_user_asset.html:52 -#: assets/templates/assets/system_user_list.html:30 -#: users/templates/users/user_group_granted_asset.html:47 -msgid "Reachable" -msgstr "可连接" - -#: assets/templates/assets/_asset_list_modal.html:25 -#: assets/templates/assets/admin_user_list.html:30 -#: assets/templates/assets/asset_list.html:91 -#: assets/templates/assets/domain_gateway_list.html:62 -#: assets/templates/assets/domain_list.html:18 -#: assets/templates/assets/label_list.html:17 -#: assets/templates/assets/system_user_list.html:34 -#: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:64 -#: ops/templates/ops/task_history.html:65 ops/templates/ops/task_list.html:42 -#: perms/templates/perms/asset_permission_list.html:60 -#: terminal/templates/terminal/session_list.html:80 -#: terminal/templates/terminal/terminal_list.html:36 -#: users/templates/users/user_group_list.html:15 -#: users/templates/users/user_list.html:28 -msgid "Action" -msgstr "动作" - -#: assets/templates/assets/_asset_list_modal.html:34 -#: assets/templates/assets/asset_list.html:100 -#: users/templates/users/user_list.html:37 -msgid "Delete selected" -msgstr "批量删除" - -#: assets/templates/assets/_asset_list_modal.html:35 -#: assets/templates/assets/asset_list.html:101 -#: users/templates/users/user_list.html:38 -msgid "Update selected" -msgstr "批量更新" - -#: assets/templates/assets/_asset_list_modal.html:36 -#: assets/templates/assets/asset_list.html:103 -#: users/templates/users/user_list.html:39 -msgid "Deactive selected" -msgstr "禁用所选" - -#: assets/templates/assets/_asset_list_modal.html:37 -#: assets/templates/assets/asset_list.html:104 -#: users/templates/users/user_list.html:40 -msgid "Active selected" -msgstr "激活所选" - -#: assets/templates/assets/_asset_list_modal.html:41 -#: assets/templates/assets/_system_user.html:71 -#: assets/templates/assets/admin_user_create_update.html:46 -#: assets/templates/assets/asset_bulk_update.html:24 -#: assets/templates/assets/asset_create.html:67 -#: assets/templates/assets/asset_list.html:108 -#: assets/templates/assets/asset_update.html:71 -#: assets/templates/assets/domain_create_update.html:17 -#: assets/templates/assets/gateway_create_update.html:59 -#: assets/templates/assets/label_create_update.html:17 -#: common/templates/common/basic_setting.html:59 -#: common/templates/common/email_setting.html:60 -#: common/templates/common/ldap_setting.html:60 -#: common/templates/common/terminal_setting.html:103 -#: perms/templates/perms/asset_permission_create_update.html:70 -#: terminal/templates/terminal/session_list.html:120 -#: terminal/templates/terminal/terminal_update.html:48 -#: users/templates/users/_user.html:44 -#: users/templates/users/first_login.html:62 -#: users/templates/users/forgot_password.html:44 -#: users/templates/users/user_bulk_update.html:24 -#: users/templates/users/user_list.html:44 -#: users/templates/users/user_password_update.html:59 -#: users/templates/users/user_profile_update.html:64 -#: users/templates/users/user_pubkey_update.html:77 -msgid "Submit" -msgstr "提交" - -#: assets/templates/assets/_asset_list_modal.html:79 -#: assets/templates/assets/admin_user_detail.html:24 -#: assets/templates/assets/admin_user_list.html:85 -#: assets/templates/assets/asset_detail.html:24 -#: assets/templates/assets/asset_list.html:168 -#: assets/templates/assets/domain_detail.html:24 -#: assets/templates/assets/domain_detail.html:103 -#: assets/templates/assets/domain_gateway_list.html:90 -#: assets/templates/assets/domain_list.html:42 -#: assets/templates/assets/label_list.html:38 -#: assets/templates/assets/system_user_detail.html:26 -#: assets/templates/assets/system_user_list.html:88 -#: perms/templates/perms/asset_permission_detail.html:30 -#: perms/templates/perms/asset_permission_list.html:191 -#: terminal/templates/terminal/terminal_detail.html:16 -#: terminal/templates/terminal/terminal_list.html:71 -#: users/templates/users/user_detail.html:25 -#: users/templates/users/user_group_detail.html:28 -#: users/templates/users/user_group_list.html:43 -#: users/templates/users/user_list.html:76 -#: users/templates/users/user_profile.html:135 -#: users/templates/users/user_profile.html:143 -msgid "Update" -msgstr "更新" - -#: assets/templates/assets/_asset_list_modal.html:80 -#: assets/templates/assets/admin_user_detail.html:28 -#: assets/templates/assets/admin_user_list.html:86 -#: assets/templates/assets/asset_detail.html:28 -#: assets/templates/assets/asset_list.html:169 -#: assets/templates/assets/domain_detail.html:28 -#: assets/templates/assets/domain_detail.html:104 -#: assets/templates/assets/domain_gateway_list.html:91 -#: assets/templates/assets/domain_list.html:43 -#: assets/templates/assets/label_list.html:39 -#: assets/templates/assets/system_user_detail.html:30 -#: assets/templates/assets/system_user_list.html:89 -#: ops/templates/ops/task_list.html:72 -#: perms/templates/perms/asset_permission_detail.html:34 -#: perms/templates/perms/asset_permission_list.html:192 -#: terminal/templates/terminal/terminal_list.html:73 -#: users/templates/users/user_detail.html:30 -#: users/templates/users/user_group_detail.html:32 -#: users/templates/users/user_group_list.html:45 -#: users/templates/users/user_list.html:80 -#: users/templates/users/user_list.html:84 -msgid "Delete" -msgstr "删除" +#: assets/templates/assets/_asset_list_modal.html:7 assets/views/asset.py:50 +#: templates/_nav.html:23 +msgid "Asset list" +msgstr "资产列表" #: assets/templates/assets/_system_user.html:37 #: assets/templates/assets/asset_create.html:16 @@ -790,6 +654,33 @@ msgstr "其它" msgid "Reset" msgstr "重置" +#: assets/templates/assets/_system_user.html:71 +#: assets/templates/assets/admin_user_create_update.html:46 +#: assets/templates/assets/asset_bulk_update.html:24 +#: assets/templates/assets/asset_create.html:67 +#: assets/templates/assets/asset_list.html:108 +#: assets/templates/assets/asset_update.html:71 +#: assets/templates/assets/domain_create_update.html:17 +#: assets/templates/assets/gateway_create_update.html:59 +#: assets/templates/assets/label_create_update.html:17 +#: common/templates/common/basic_setting.html:59 +#: common/templates/common/email_setting.html:60 +#: common/templates/common/ldap_setting.html:60 +#: common/templates/common/terminal_setting.html:103 +#: perms/templates/perms/asset_permission_create_update.html:70 +#: terminal/templates/terminal/session_list.html:120 +#: terminal/templates/terminal/terminal_update.html:48 +#: users/templates/users/_user.html:44 +#: users/templates/users/first_login.html:62 +#: users/templates/users/forgot_password.html:44 +#: users/templates/users/user_bulk_update.html:24 +#: users/templates/users/user_list.html:44 +#: users/templates/users/user_password_update.html:59 +#: users/templates/users/user_profile_update.html:64 +#: users/templates/users/user_pubkey_update.html:77 +msgid "Submit" +msgstr "提交" + #: assets/templates/assets/admin_user_assets.html:18 #: assets/templates/assets/admin_user_detail.html:18 #: assets/templates/assets/domain_detail.html:18 @@ -815,6 +706,15 @@ msgstr "资产列表" msgid "Asset list of " msgstr "资产列表" +#: assets/templates/assets/admin_user_assets.html:54 +#: assets/templates/assets/admin_user_list.html:26 +#: assets/templates/assets/asset_list.html:90 +#: assets/templates/assets/system_user_asset.html:52 +#: assets/templates/assets/system_user_list.html:30 +#: users/templates/users/user_group_granted_asset.html:47 +msgid "Reachable" +msgstr "可连接" + #: assets/templates/assets/admin_user_assets.html:66 #: assets/templates/assets/system_user_asset.html:64 #: assets/templates/assets/system_user_detail.html:112 @@ -834,6 +734,53 @@ msgstr "测试可连接性" msgid "Test" msgstr "测试" +#: assets/templates/assets/admin_user_detail.html:24 +#: assets/templates/assets/admin_user_list.html:85 +#: assets/templates/assets/asset_detail.html:24 +#: assets/templates/assets/asset_list.html:170 +#: assets/templates/assets/domain_detail.html:24 +#: assets/templates/assets/domain_detail.html:103 +#: assets/templates/assets/domain_gateway_list.html:90 +#: assets/templates/assets/domain_list.html:42 +#: assets/templates/assets/label_list.html:38 +#: assets/templates/assets/system_user_detail.html:26 +#: assets/templates/assets/system_user_list.html:88 +#: perms/templates/perms/asset_permission_detail.html:30 +#: perms/templates/perms/asset_permission_list.html:191 +#: terminal/templates/terminal/terminal_detail.html:16 +#: terminal/templates/terminal/terminal_list.html:71 +#: users/templates/users/user_detail.html:25 +#: users/templates/users/user_group_detail.html:28 +#: users/templates/users/user_group_list.html:43 +#: users/templates/users/user_list.html:76 +#: users/templates/users/user_profile.html:135 +#: users/templates/users/user_profile.html:143 +msgid "Update" +msgstr "更新" + +#: assets/templates/assets/admin_user_detail.html:28 +#: assets/templates/assets/admin_user_list.html:86 +#: assets/templates/assets/asset_detail.html:28 +#: assets/templates/assets/asset_list.html:171 +#: assets/templates/assets/domain_detail.html:28 +#: assets/templates/assets/domain_detail.html:104 +#: assets/templates/assets/domain_gateway_list.html:91 +#: assets/templates/assets/domain_list.html:43 +#: assets/templates/assets/label_list.html:39 +#: assets/templates/assets/system_user_detail.html:30 +#: assets/templates/assets/system_user_list.html:89 +#: ops/templates/ops/task_list.html:72 +#: perms/templates/perms/asset_permission_detail.html:34 +#: perms/templates/perms/asset_permission_list.html:192 +#: terminal/templates/terminal/terminal_list.html:73 +#: users/templates/users/user_detail.html:30 +#: users/templates/users/user_group_detail.html:32 +#: users/templates/users/user_group_list.html:45 +#: users/templates/users/user_list.html:80 +#: users/templates/users/user_list.html:84 +msgid "Delete" +msgstr "删除" + #: assets/templates/assets/admin_user_detail.html:83 msgid "Replace node assets admin user with this" msgstr "替换资产的管理员" @@ -845,9 +792,9 @@ msgstr "选择节点" #: assets/templates/assets/admin_user_detail.html:100 #: assets/templates/assets/asset_detail.html:200 -#: assets/templates/assets/asset_list.html:603 +#: assets/templates/assets/asset_list.html:600 #: assets/templates/assets/system_user_detail.html:183 -#: assets/templates/assets/system_user_list.html:138 templates/_modal.html:16 +#: assets/templates/assets/system_user_list.html:138 templates/_modal.html:22 #: terminal/templates/terminal/session_detail.html:108 #: users/templates/users/user_detail.html:339 #: users/templates/users/user_detail.html:364 @@ -876,7 +823,23 @@ msgstr "不可达" msgid "Ratio" msgstr "比例" -#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:197 +#: assets/templates/assets/admin_user_list.html:30 +#: assets/templates/assets/asset_list.html:91 +#: assets/templates/assets/domain_gateway_list.html:62 +#: assets/templates/assets/domain_list.html:18 +#: assets/templates/assets/label_list.html:17 +#: assets/templates/assets/system_user_list.html:34 +#: ops/templates/ops/adhoc_history.html:59 ops/templates/ops/task_adhoc.html:64 +#: ops/templates/ops/task_history.html:65 ops/templates/ops/task_list.html:42 +#: perms/templates/perms/asset_permission_list.html:60 +#: terminal/templates/terminal/session_list.html:80 +#: terminal/templates/terminal/terminal_list.html:36 +#: users/templates/users/user_group_list.html:15 +#: users/templates/users/user_list.html:28 +msgid "Action" +msgstr "动作" + +#: assets/templates/assets/asset_detail.html:20 assets/views/asset.py:198 msgid "Asset detail" msgstr "资产详情" @@ -901,6 +864,23 @@ msgstr "创建日期" msgid "Quick modify" msgstr "快速修改" +#: assets/templates/assets/asset_detail.html:143 +#: assets/templates/assets/asset_list.html:89 +#: assets/templates/assets/user_asset_list.html:47 perms/models.py:25 +#: perms/models.py:70 +#: perms/templates/perms/asset_permission_create_update.html:47 +#: perms/templates/perms/asset_permission_detail.html:120 +#: perms/templates/perms/asset_permission_list.html:59 +#: terminal/templates/terminal/terminal_list.html:34 +#: users/templates/users/_select_user_modal.html:18 +#: users/templates/users/user_detail.html:128 +#: users/templates/users/user_granted_asset.html:46 +#: users/templates/users/user_group_granted_asset.html:46 +#: users/templates/users/user_list.html:27 +#: users/templates/users/user_profile.html:63 +msgid "Active" +msgstr "激活中" + #: assets/templates/assets/asset_detail.html:160 msgid "Refresh hardware" msgstr "更新硬件信息" @@ -914,8 +894,7 @@ msgstr "刷新" msgid "Update successfully!" msgstr "更新成功" -#: assets/templates/assets/asset_list.html:63 -#: assets/templates/assets/asset_list.html:120 assets/views/asset.py:96 +#: assets/templates/assets/asset_list.html:63 assets/views/asset.py:97 msgid "Create asset" msgstr "创建资产" @@ -929,43 +908,75 @@ msgstr "导入" msgid "Export" msgstr "导出" +#: assets/templates/assets/asset_list.html:88 +msgid "Hardware" +msgstr "硬件" + +#: assets/templates/assets/asset_list.html:100 +#: users/templates/users/user_list.html:37 +msgid "Delete selected" +msgstr "批量删除" + +#: assets/templates/assets/asset_list.html:101 +#: users/templates/users/user_list.html:38 +msgid "Update selected" +msgstr "批量更新" + #: assets/templates/assets/asset_list.html:102 msgid "Remove from this node" msgstr "从节点移除" +#: assets/templates/assets/asset_list.html:103 +#: users/templates/users/user_list.html:39 +msgid "Deactive selected" +msgstr "禁用所选" + +#: assets/templates/assets/asset_list.html:104 +#: users/templates/users/user_list.html:40 +msgid "Active selected" +msgstr "激活所选" + #: assets/templates/assets/asset_list.html:121 -msgid "Add asset" -msgstr "添加资产到节点" - -#: assets/templates/assets/asset_list.html:122 -msgid "Refresh node hardware info" -msgstr "更新节点资产硬件信息" - -#: assets/templates/assets/asset_list.html:123 -msgid "Test node connective" -msgstr "测试节点资产可连接性" - -#: assets/templates/assets/asset_list.html:125 msgid "Add node" msgstr "新建节点" -#: assets/templates/assets/asset_list.html:126 +#: assets/templates/assets/asset_list.html:122 msgid "Rename node" msgstr "重命名节点" -#: assets/templates/assets/asset_list.html:128 +#: assets/templates/assets/asset_list.html:123 msgid "Delete node" msgstr "删除节点" -#: assets/templates/assets/asset_list.html:202 +#: assets/templates/assets/asset_list.html:125 +msgid "Add assets to node" +msgstr "添加资产到节点" + +#: assets/templates/assets/asset_list.html:126 +msgid "Move assets to node" +msgstr "移动资产到节点" + +#: assets/templates/assets/asset_list.html:128 +msgid "Refresh node hardware info" +msgstr "更新节点资产硬件信息" + +#: assets/templates/assets/asset_list.html:129 +msgid "Test node connective" +msgstr "测试节点资产可连接性" + +#: assets/templates/assets/asset_list.html:204 msgid "Create node failed" msgstr "创建节点失败" -#: assets/templates/assets/asset_list.html:215 +#: assets/templates/assets/asset_list.html:216 msgid "Have child node, cancel" msgstr "存在子节点，不能删除" -#: assets/templates/assets/asset_list.html:598 +#: assets/templates/assets/asset_list.html:218 +msgid "Have assets, cancel" +msgstr "存在资产，不能删除" + +#: assets/templates/assets/asset_list.html:595 #: assets/templates/assets/system_user_list.html:133 #: users/templates/users/user_detail.html:334 #: users/templates/users/user_detail.html:359 @@ -974,20 +985,20 @@ msgstr "存在子节点，不能删除" msgid "Are you sure?" msgstr "你确认吗?" -#: assets/templates/assets/asset_list.html:599 +#: assets/templates/assets/asset_list.html:596 msgid "This will delete the selected assets !!!" msgstr "删除选择资产" -#: assets/templates/assets/asset_list.html:607 +#: assets/templates/assets/asset_list.html:604 msgid "Asset Deleted." msgstr "已被删除" -#: assets/templates/assets/asset_list.html:608 -#: assets/templates/assets/asset_list.html:613 +#: assets/templates/assets/asset_list.html:605 +#: assets/templates/assets/asset_list.html:610 msgid "Asset Delete" msgstr "删除" -#: assets/templates/assets/asset_list.html:612 +#: assets/templates/assets/asset_list.html:609 msgid "Asset Deleting failed." msgstr "删除失败" @@ -1108,23 +1119,19 @@ msgstr "更新管理用户" msgid "Admin user detail" msgstr "管理用户详情" -#: assets/views/asset.py:50 templates/_nav.html:23 -msgid "Asset list" -msgstr "资产列表" - -#: assets/views/asset.py:62 templates/_nav_user.html:4 +#: assets/views/asset.py:63 templates/_nav_user.html:4 msgid "My assets" msgstr "我的资产" -#: assets/views/asset.py:156 +#: assets/views/asset.py:157 msgid "Bulk update asset" msgstr "批量更新资产" -#: assets/views/asset.py:173 +#: assets/views/asset.py:174 msgid "Update asset" msgstr "更新资产" -#: assets/views/asset.py:308 +#: assets/views/asset.py:311 msgid "already exists" msgstr "已经存在" @@ -1906,7 +1913,7 @@ msgstr "" "\"%(user_pubkey_update)s\"> 链接 更新\n" " " -#: templates/_modal.html:15 +#: templates/_modal.html:21 msgid "Close" msgstr "关闭" @@ -2449,11 +2456,6 @@ msgstr "重置密码" msgid "Password again" msgstr "再次输入密码" -#: users/templates/users/reset_password.html:57 -#: users/templates/users/user_profile.html:20 -msgid "Setting" -msgstr "设置" - #: users/templates/users/user_create.html:4 #: users/templates/users/user_list.html:16 users/views/user.py:75 msgid "Create user" @@ -2839,3 +2841,5 @@ msgstr "密码更新" msgid "Public key update" msgstr "密钥更新" +#~ msgid "Add asset" +#~ msgstr "添加资产到节点" diff --git a/apps/perms/templates/perms/asset_permission_create_update.html b/apps/perms/templates/perms/asset_permission_create_update.html index 197044856..551aab142 100644 --- a/apps/perms/templates/perms/asset_permission_create_update.html +++ b/apps/perms/templates/perms/asset_permission_create_update.html @@ -76,20 +76,37 @@
+ {% include 'assets/_asset_list_modal.html' %} {% endblock %} {% block custom_foot_js %} - - + + {% endblock %} \ No newline at end of file diff --git a/apps/templates/_modal.html b/apps/templates/_modal.html index 7705b8660..e84586d0c 100644 --- a/apps/templates/_modal.html +++ b/apps/templates/_modal.html @@ -1,4 +1,9 @@ {% load i18n %} +