From b4c13069c0710150cea4d25945c790030a8beb50 Mon Sep 17 00:00:00 2001 From: halcyon <864072399@qq.com> Date: Fri, 20 Nov 2015 00:03:36 +0800 Subject: [PATCH 01/13] batch asset alert --- jasset/views.py | 48 +++++ .../excels/cmdb_excel_2015_11_19_22_05.xlsx | Bin 0 -> 6117 bytes templates/jasset/asset_add_bak.html | 166 ---------------- templates/jasset/asset_edit_batch.html | 30 +-- templates/jasset/asset_list.html | 6 +- templates/jasset/host_add_multi.html | 68 ------- templates/jasset/host_list_common.html | 172 ----------------- templates/jasset/host_list_nop.html | 177 ------------------ templates/jasset/host_search.html | 169 ----------------- templates/nav.html | 2 +- 10 files changed, 60 insertions(+), 778 deletions(-) create mode 100644 static/files/excels/cmdb_excel_2015_11_19_22_05.xlsx delete mode 100644 templates/jasset/asset_add_bak.html delete mode 100644 templates/jasset/host_add_multi.html delete mode 100644 templates/jasset/host_list_common.html delete mode 100644 templates/jasset/host_list_nop.html delete mode 100644 templates/jasset/host_search.html diff --git a/jasset/views.py b/jasset/views.py index 253e6ee24..1a77f517b 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -306,6 +306,54 @@ def asset_list(request): def asset_edit_batch(request): af = AssetForm() asset_group_all = AssetGroup.objects.all() + + if request.method == 'POST': + env = request.POST.get('env', '') + idc_id = request.POST.get('idc', '') + port = request.POST.get('port', '') + use_default_auth = request.POST.get('use_default_auth', '') + username = request.POST.get('username', '') + password = request.POST.get('password', '') + group = request.POST.getlist('group', []) + cabinet = request.POST.get('cabinet', '') + comment = request.POST.get('comment', '') + asset_id_all = unicode(request.GET.get('asset_id_all', '')) + asset_id_all = asset_id_all.split(',') + for asset_id in asset_id_all: + asset = get_object(Asset, id=asset_id) + if asset: + if env: + asset.env = env + if idc_id: + idc = get_object(IDC, id=idc_id) + if idc: + asset.idc = idc + if port: + asset.port = port + if use_default_auth: + if use_default_auth == 'default': + asset.use_default_auth = 1 + asset.username = '' + asset.password = '' + elif use_default_auth == 'user_passwd': + asset.use_default_auth = 0 + asset.username = username + password_encode = CRYPTOR.encrypt(password) + asset.password = password_encode + if group: + group_instance = [] + for group_id in group: + g = get_object(AssetGroup, id=group_id) + if g: + group_instance.append(g) + asset.group = group_instance + if cabinet: + asset.cabinet = cabinet + if comment: + asset.comment = comment + asset.save() + return HttpResponse('ok') + return my_render('jasset/asset_edit_batch.html', locals(), request) diff --git a/static/files/excels/cmdb_excel_2015_11_19_22_05.xlsx b/static/files/excels/cmdb_excel_2015_11_19_22_05.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..0c2778b8964fc3111d894fdf8beecd20e83e9953 GIT binary patch literal 6117 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
    *bQr_yZc(sV7#>s=`|laD2|A(8oXXm z>Zs=Ls&^xO%U?(oHR-5t{Io77X4vKPw42C@F}#O!OLq=8GRl`Wp3FbmC8ob;XY)mi z?DM#U7fK3B)Dv=2N5Yx2z9$S^7wVGF$qt>C2)Nf;uTW2D{>iDSk)nt?g3}mO0DuU= zsez1>qZ`!G%~I<$TBg#(gbOk(dj2_Z76?5PxIm%jC_S{b4t*;GuBmW zH_EcDzTjb&I19TOmk8Rqin;fqlrTk5$p^>qYNgHF$+dS^oZRnDBf1x@nR6eJ&m8Cg z0M5T2HEu8Lp}(IoEm{tdvFd|6dP8tjJNPeSlCdhF;!X8rgjl*O-M-u2RS9&3s3YjdIw8~ud)f(24rOOZwfYfYlZj8f*K-E! zR@j%ZJAWhG!7@alE9Y^XK4Fx!TqSmqolv}loPd*Qov_?RS>CE)2>Xe*Q>ob)AX9VC z1_&lEEJbUyG}>#`!Ql+6(gAT($cr$6JV2aL97I2ZlFi|lK}2h^@+C_tgcuQ9x|P(c z%JrCNgZcd>lK^i&u2FxIZ;40Vg~uO_E)oOh#_5G4G$)5gZ0n4i9r=P(oHK58 zIINv4oNg6KRDZm?6?Jc{Ix|2V1mx)A$!t4ZUhR4<>RGiHG{W0?Z<9k~BO|@?r%-?m zaBUg?&~5&jmu)Tg(OP8*6n8Ey>tp1bWaGS5VOL)sMf*Has>_+om6Ssxfd`veu&q@~w5zM515H(n*Kv+h^ZpwKOu!v_&i|KqfjBlhMyfv;q8Biv~mX6QjjT3?X}i=~!K= ze^a?rT5_5ZUJS0LFp{`UbYqg@E?ak_ry2rfwl=vyt%lm3?HhkS@oI4#PCXhxnmp^! zv;u9P8mL))eu4r{9%ydjFJIF+pt$`^=$HF-(~}bHV;EKppd1jh0C ztYHI%7LQYhPs%nep5PSed-nkZk^yQ@N44{a;4tQNfL6sGqp51cFIc)E1X#T#>k`dg zH^ePoH!CZP9}~hPvcxB31&SAO_x>wMnt>iD~H zD>q6KuFt`@g!$}8FAh$uUi#cl0_I6Pi@GrQmm^L*7}tr#PU|5@W@SOE_+ZOL zvvRdHG_U&MzVRegn zhg%?@jJ*L#edRbpw#3WN3d|`xx7_30a<(*UlZk$>zycgpVF#7eABbeJP*L)K=J^^Y zSQ(+BM6DKL>{73VzZuIN?S&LKChKaT@?dM%Y(w^Q#a^Y2p&X`M5A%xZU_-2>%5%;1Zl?(Rnr%IN*vtC5Wf^@)<9b^4P%KHuOPS$W27$}Eb zFN`qXuv4*JzfV*`O_N)E{>aiwQqsJpC&;WRCmUzo{!p9cxzy{Zj>b+3-8r?CCxGvX zYo3-ibE#wYU(z8sKr4)wg?e1FGM`Q40|)oeg7ltpiplbJBC(pUkm0yc*fo}(c$M3X z2~arQcgUpOT$%wdHDiTqIR=sRS$<34IZxPD~J{;T#oePmjyJ@q=Uv3;_*CUD(sTm7e82c%Njf)3K?`2Yqhx zM!tSWk%QwDO{^_zJGPwfWCz^Xmc#lQi?7?;L$!~W^z(##EKQLKHa;0tc)GS8LJ-E8 zC_lc3MMeeFdrKNv)vG1V?meHesT57(Te6_R*TAib!6zFiUHBx9*1|Z+y)`uT$@lE? zhw{+u)RG5Zmpl}rfs_{C;DbAL5Wa2ZdBKio|5*b)RzM0gsn>=z3+Rd!BUMS8nhd7~S9TQyBTRphS$_J;!%U66e@~oCiW)nh90goD$s{{YA&QKM_1d2ut6W!O*OLv=arU9?tBiv?ZZ|5O74TRW+yo; z$hP94;0+7Uka=z!2R3AnFDzt(vGu~aBZWo16|=rHVGjtChxdqc9V5F;oNeiT zoDj_%@pJC~E|8xx-Nt>mwY0?mQAR>0M)}_hRRl@DU;Y8VF8^!2dN<15<0094h z3k383it;z#cfog;Du2K)5#Hm!tyu0xxNF+~L@-56&vz~SUG!b|_yW{8|vU+pZ*Vt1D&=2 literal 0 HcmV?d00001 diff --git a/templates/jasset/asset_add_bak.html b/templates/jasset/asset_add_bak.html deleted file mode 100644 index 397d60aeb..000000000 --- a/templates/jasset/asset_add_bak.html +++ /dev/null @@ -1,166 +0,0 @@ -{% extends 'base.html' %} -{% load mytags %} -{% block content %} -{% include 'nav_cat_bar.html' %} -
    -
    -
    -
    -
    -
    填写资产基本信息
    - -
    - -
    -
    - -
    -
    -
    - {% if error %} -
    {{ error }}
    - {% endif %} - {% if msg %} -
    {{ msg }}
    - {% endif %} -
    -
    -
    -
    - -
    -
    - -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    -
    - - - -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - - -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -{% endblock %} - -{% block self_footer_js %} - - -{% endblock %} \ No newline at end of file diff --git a/templates/jasset/asset_edit_batch.html b/templates/jasset/asset_edit_batch.html index b41afcb7b..65987cd64 100644 --- a/templates/jasset/asset_edit_batch.html +++ b/templates/jasset/asset_edit_batch.html @@ -49,33 +49,31 @@ {{ af.port|bootstrap_horizontal }}
    -
    +
    - - -{% endblock %} \ No newline at end of file diff --git a/templates/jasset/host_list_nop.html b/templates/jasset/host_list_nop.html deleted file mode 100644 index eb1e3dd34..000000000 --- a/templates/jasset/host_list_nop.html +++ /dev/null @@ -1,177 +0,0 @@ -{% extends 'base.html' %} -{% load mytags %} -{% block content %} -{% include 'nav_cat_bar.html' %} - -
    -
    -
    -
    -
    -
    主机详细信息列表
    - -
    - -
    -
    - 添加 - - - - - - - - - - - -
    - -
    - - - - - - - - - - - - - - - - - {% for post in posts %} - - - - - - - - - - - - - {% endfor %} - -
    IP地址 端口号 登录方式 所属IDC 所属部门 所属主机组 是否激活 备注 操作
    {{ post.ip }} {{ post.port }} {{ post.login_type|get_login_type }} {{ post.idc.name }} {{ post.dept.all | group_str2 }}{{ post.bis_group.all | group_str2_all }} {{ post.is_active|bool2str }} {{ post.comment }} - 详情 - {% ifnotequal session_role_id 0 %} - 编辑 - 删除 - {% endifnotequal %} -
    -
    -
    - - -
    - -
    -
    -
    -
    -
    -
    -
    - - - -{% endblock %} \ No newline at end of file diff --git a/templates/jasset/host_search.html b/templates/jasset/host_search.html deleted file mode 100644 index 38ed8c1ad..000000000 --- a/templates/jasset/host_search.html +++ /dev/null @@ -1,169 +0,0 @@ -{% load mytags %} - - - - - - - - - - {% ifnotequal session_role_id 0 %} - - {% else %} - - {% endifnotequal %} - - - - - - - {% for post in contacts.object_list %} - - - - - - - - {% ifnotequal session_role_id 0 %} - - {% else %} - - {% endifnotequal %} - - - - - {% endfor %} - -
    IP地址 端口号 登录方式 所属IDC 所属业务组 是否激活 别名 添加时间 备注 操作
    {{ post.ip }} {{ post.port }} {{ post.login_type|get_login_type }} {{ post.idc.name }} {{ post.bis_group.all | group_str2 }} {{ post.is_active|bool2str }} {{ post|get_user_alias:user_id }} {{ post.date_added|date:"Y-m-d H:i:s" }} {{ post.comment }} - 详情 - {% ifnotequal session_role_id 0 %} - 编辑 - 删除 - {% endifnotequal %} -
    -
    -
    - - -
    -
    -
    -
      - - {% if contacts.has_previous %} - - {% else %} - - {% endif %} - {% ifequal show_first 1 %} -
    • 1...
    • - {% endifequal %} - {% for page in page_range %} - {% ifequal current_page page %} -
    • {{ page }}
    • - {% else %} -
    • {{ page }}
    • - {% endifequal %} - {% endfor %} - {% ifequal show_end 1 %} -
    • ...{{ p.num_pages }}
    • - {% endifequal %} - {% if contacts.has_next %} - - {% else %} - - {% endif %} -
    -
    -
    - -
    - - diff --git a/templates/nav.html b/templates/nav.html index 979110492..12ae07d44 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -20,7 +20,7 @@
    主机修改记录
    +     点击修改 +
    {{ af.group|bootstrap_horizontal }} @@ -156,15 +165,17 @@ $('document').ready(function(){ $('#id_use_default_auth').click(function(){ if ($(this).is(':checked')){ - $('#admin_account').css('display', 'none') + $('#admin_account').css('display', 'none'); + $('#id_port').css('display', 'none') } else { - $('#admin_account').css('display', 'block') + $('#admin_account').css('display', 'block'); + $('#id_port').css('display', 'block') } }) }); - var required_fields = ["id_ip", "id_port"]; + var required_fields = ["id_hostname", "id_port"]; required_fields.forEach(function(field) { $('label[for="' + field + '"]').parent().addClass("required"); }); @@ -177,18 +188,23 @@ check_port: [/^\d{1,5}$/, '端口号不正确'], }, fields: { - "ip": { - rule: "required;check_ip", - tip: "输入IP", + "hostname": { + rule: "required", + tip: "填写主机名", ok: "", msg: {required: "必须填写!"} }, - "port": { - rule: "required;check_port", - tip: "输入端口号", - ok: "", - msg: {required: "必须填写!"} - } +{# "ip": {#} +{# rule: "required;check_ip",#} +{# tip: "输入IP",#} +{# ok: "",#} +{# msg: {required: "必须填写!"}#} +{# },#} +{# "port": {#} +{# rule: "required;check_port",#} +{# tip: "输入端口号",#} +{# ok: "",#} +{# msg: {required: "必须填写!"}#} }, valid: function(form) { form.submit(); diff --git a/templates/jasset/asset_edit_batch.html b/templates/jasset/asset_edit_batch.html index 65987cd64..415146733 100644 --- a/templates/jasset/asset_edit_batch.html +++ b/templates/jasset/asset_edit_batch.html @@ -7,9 +7,9 @@ -{# #} + {% load bootstrap %} @@ -20,21 +20,21 @@
    - +{#
    #} +{#
    填写修改主机信息.
    #} +{#
    #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{#
    #} +{#
    #}
    diff --git a/templates/jasset/asset_list.html b/templates/jasset/asset_list.html index b6e2eacd2..26572fa27 100644 --- a/templates/jasset/asset_list.html +++ b/templates/jasset/asset_list.html @@ -70,7 +70,7 @@