From f9b1d3059af18b6c797c988ba2ed8418acc78d76 Mon Sep 17 00:00:00 2001 From: halcyon <864072399@qq.com> Date: Thu, 19 Nov 2015 21:58:44 +0800 Subject: [PATCH] fix bugs --- jasset/asset_api.py | 6 ++++- jasset/views.py | 15 ++++++----- .../excels/cmdb_excel_2015_11_18_21_40.xlsx | Bin 0 -> 4990 bytes .../excels/cmdb_excel_2015_11_18_21_52.xlsx | Bin 0 -> 4990 bytes .../excels/cmdb_excel_2015_11_18_21_53.xlsx | Bin 0 -> 6163 bytes .../excels/cmdb_excel_2015_11_18_21_54.xlsx | Bin 0 -> 5885 bytes .../excels/cmdb_excel_2015_11_18_22_17.xlsx | Bin 0 -> 5885 bytes templates/jasset/asset_detail.html | 2 +- templates/jasset/asset_excel_download.html | 3 +-- templates/jasset/asset_list.html | 18 ++++++------- templates/jasset/group_list.html | 24 ++++++++---------- 11 files changed, 36 insertions(+), 32 deletions(-) create mode 100644 static/files/excels/cmdb_excel_2015_11_18_21_40.xlsx create mode 100644 static/files/excels/cmdb_excel_2015_11_18_21_52.xlsx create mode 100644 static/files/excels/cmdb_excel_2015_11_18_21_53.xlsx create mode 100644 static/files/excels/cmdb_excel_2015_11_18_21_54.xlsx create mode 100644 static/files/excels/cmdb_excel_2015_11_18_22_17.xlsx diff --git a/jasset/asset_api.py b/jasset/asset_api.py index 284574379..8103db23b 100644 --- a/jasset/asset_api.py +++ b/jasset/asset_api.py @@ -311,8 +311,12 @@ def write_excel(asset_all): group_all = '/'.join(group_list) status = asset.get_status_display() idc_name = asset.idc.name if asset.idc else u'' + system_type = asset.system_type if asset.idc else u'' + system_version = asset.system_version if asset.idc else u'' + system_os = unicode(system_type) + unicode(system_version) + alter_dic = [asset.hostname, asset.ip, idc_name, asset.mac, asset.remote_ip, asset.cpu, asset.memory, - asset.disk, (asset.system_type + asset.system_version), asset.cabinet, group_all, status, + asset.disk, system_os, asset.cabinet, group_all, status, asset.comment] data.append(alter_dic) format = workbook.add_format() diff --git a/jasset/views.py b/jasset/views.py index 6bafd5664..253e6ee24 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -13,7 +13,7 @@ from ansible_api import Tasks @require_role('admin') def group_add(request): """ - Add asset group + Group add view 添加资产组 """ header_title, path1, path2 = u'添加资产组', u'资产管理', u'添加资产组' @@ -47,7 +47,7 @@ def group_add(request): @require_role('admin') def group_edit(request): """ - Edit asset group + Group edit view 编辑资产组 """ header_title, path1, path2 = u'编辑主机组', u'资产管理', u'编辑主机组' @@ -89,7 +89,10 @@ def group_edit(request): @require_role('admin') def group_detail(request): - """ 主机组详情 """ + """ + Group detail view + 主机组详情 + """ header_title, path1, path2 = u'主机组详情', u'资产管理', u'主机组详情' group_id = request.GET.get('id', '') group = get_object(AssetGroup, id=group_id) @@ -121,7 +124,7 @@ def group_list(request): @require_role('admin') def group_del(request): """ - del asset group + Group delete view 删除主机组 """ group_ids = request.GET.get('id', '') @@ -293,7 +296,7 @@ def asset_list(request): s = write_excel(asset_find) if s[0]: file_name = s[1] - smg = 'excel文件已生成,请点击下载!' + smg = u'excel文件已生成,请点击下载!' return my_render('jasset/asset_excel_download.html', locals(), request) assets_list, p, assets, page_range, current_page, show_first, show_end = pages(asset_find, request) return my_render('jasset/asset_list.html', locals(), request) @@ -463,7 +466,7 @@ def idc_del(request): @require_role('admin') def asset_upload(request): """ - Upload file view + Upload asset excel file view """ if request.method == 'POST': excel_file = request.FILES.get('file_name', '') diff --git a/static/files/excels/cmdb_excel_2015_11_18_21_40.xlsx b/static/files/excels/cmdb_excel_2015_11_18_21_40.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..2acd14d7804282269546e2936cbd66c74abb9728 GIT binary patch literal 4990 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 literal 0 HcmV?d00001 diff --git a/static/files/excels/cmdb_excel_2015_11_18_21_52.xlsx b/static/files/excels/cmdb_excel_2015_11_18_21_52.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..8bbd9456543f283645bb753c789c6948ecafacb3 GIT binary patch literal 4990 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 literal 0 HcmV?d00001 diff --git a/static/files/excels/cmdb_excel_2015_11_18_21_53.xlsx b/static/files/excels/cmdb_excel_2015_11_18_21_53.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..5a0f01efc9a11ff4354a7d6e843b8ddbeb183019 GIT binary patch literal 6163 zcmZ`-1yqz<*B;5C8JIyjrMpukhOVKdL}KV15Rj5iX%LVu0Y^X@=}=NaN(pH}LP8Lb z{KtF0`+H@5-^^O)ta;bk`>c7M^Xzv&8>WVi0R{j7K){Pigp&Bj^L`<80N^1J06>m< z>f^-g?TT>pu!F-rJ$V1x_<4Mso#N7s5(;IⅈbD#0yGp=7nCqscjl8wbB#!IqdWC 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 literal 0 HcmV?d00001 diff --git a/static/files/excels/cmdb_excel_2015_11_18_21_54.xlsx b/static/files/excels/cmdb_excel_2015_11_18_21_54.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..e0b025cac9a445a5c6018f8daea73774cca4c281 GIT binary patch literal 5885 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 literal 0 HcmV?d00001 diff --git a/static/files/excels/cmdb_excel_2015_11_18_22_17.xlsx b/static/files/excels/cmdb_excel_2015_11_18_22_17.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..77ff51aa56da935c976498e0a86d0d55e9a32b62 GIT binary patch literal 5885 zcmZ`-1ys{*`yL>j1BP@-OG|@D45S7dDIk)gbEK3wDQOU1x}-!(k&+IjCLtm&hNU;*>%V6>xOFLT%!g600aQhYQ)_z>Oyu!YyhAF9{`}m zeCy{dhF3zzjrk)F|wBb9)M#9ro(l0BlM;t!;y}TtG(A*uG zru8fVYxHPV$l_~;(AL(B)co@N@*=L~>8^><8u%@bF_op;oE11T84mZ1+>PJqTa}Fo z<$$R2jSUmD!5*_L=zO}hDD*r}pB+9NNpM}aj;aUfpy1dcOFi}NxBdZg`M?pZv1Q0z50Vhv$jb%E1gQ1G`4D$4(-fxdeJLLKby zf~@B<_254HeA7}$m$VKMPagif1O-dNFc9?^bV9+>i5HX=VMmNj_HMhoj_RHTIsck0 z66erHv7ImjS6J!)zpZMoXc5|B&Q9_b7=9Tyj0|a;;12~VSz?7vR&%7ho_C!(+aTo7a7XyCcnKt{n&%JGG7mwb|)@IUYC6pHb=e z*8HkFnAR+DsKp}Wa?Sw#Bkj^x#jx*T0RViM)Fc0$c2;g~PQS7ZhSKg5rf5C@jmGQfT*2peqe;o9ek<~{wKbN@Q zM~zG*zXq?QO>Lsi8JA2oQiv%^g5`4*yMuAwY*|h5wLF43>SR60pw@8Oe7c(6{4OdZ z@g=M=RcSrS1pnLMtyO2_!p8zbt*hwjdvzlj^#v~2y!3_`1Z61BMEoYDm!5Hv5Kj>_ z`IM1vZ{N414p*0)gt$o6t=t_|L`)$1^fQ%c-=diDsoyC~way}JHScmc~Zr^EEV8p*>hUcKIvQ6n-#6nUa zMT^5r&qfm$kn9_EgqLlv_AChJ&mgd-36N`Ig5Ze>!q1L?seMm-O9b3T&kNz;YUlYg z65dHDjV=Z1@MC$Ew3c)ZM;A`@#Hcx?wN7~j`yPp5Ek|3v#0zpf3BEpa1H4nI}K!33pHu5 z6*r3^c@%!W@UX50g5=U3A-V+mOk>L;^Hx?gJh?If6 z;ME|L`78FZzBf9JUcvO5E(2QDMLz?(7NC_qQLH_1a?_?m>g}$#8ieVhvvh)o*rp;` zC9@3sH0RpZIZP|HKZRc-E3`yKw&hjpCs33n%Tec7V z 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 literal 0 HcmV?d00001 diff --git a/templates/jasset/asset_detail.html b/templates/jasset/asset_detail.html index 143ca6a48..ef202bae9 100644 --- a/templates/jasset/asset_detail.html +++ b/templates/jasset/asset_detail.html @@ -91,7 +91,7 @@ 内存 - {{ asset.memory|default_if_none:"" }} + {{ asset.memory|default_if_none:"" }}{% if asset.memory %}M{% endif %} 硬盘 diff --git a/templates/jasset/asset_excel_download.html b/templates/jasset/asset_excel_download.html index d1b6738ee..113544c15 100644 --- a/templates/jasset/asset_excel_download.html +++ b/templates/jasset/asset_excel_download.html @@ -1,7 +1,6 @@
-

-

Nice! excel文件已生成请点击 下载 + Nice! excel文件已生成请点击 下载
\ No newline at end of file diff --git a/templates/jasset/asset_list.html b/templates/jasset/asset_list.html index 63eb123ad..9e3ea2d2c 100644 --- a/templates/jasset/asset_list.html +++ b/templates/jasset/asset_list.html @@ -169,17 +169,17 @@ }); $(document).ready(function(){ - $('#editable').editableTableWidget({editor: $('