diff --git a/jasset/asset_api.py b/jasset/asset_api.py index 06c91a616..a37386a72 100644 --- a/jasset/asset_api.py +++ b/jasset/asset_api.py @@ -359,7 +359,6 @@ def ansible_record(asset, ansible_dic, username): old = asset_dic.get(field) new = ansible_dic.get(field) if unicode(old) != unicode(new): - print old, new, type(old), type(new) setattr(asset, field, value) asset.save() alert_dic[field] = [old, new] @@ -384,16 +383,17 @@ def excel_to_db(excel_file): row = table.row_values(row_num) if row: ip, port, hostname, use_default_auth, username, password, group = row - use_default_auth = 1 if use_default_auth == u'默认' else 0 if get_object(Asset, hostname=hostname): continue + use_default_auth = 1 if use_default_auth == u'默认' else 0 + password_encode = CRYPTOR.encrypt(password) if password else '' if hostname: asset = Asset(ip=ip, port=port, hostname=hostname, use_default_auth=use_default_auth, username=username, - password=password + password=password_encode ) asset.save() group_list = group.split('/') diff --git a/jasset/views.py b/jasset/views.py index af24d7de2..d6d0f1a3c 100644 --- a/jasset/views.py +++ b/jasset/views.py @@ -1,6 +1,5 @@ # coding:utf-8 -import ast from django.db.models import Q from jasset.asset_api import * from jumpserver.api import * @@ -95,8 +94,6 @@ def group_list(request): """ header_title, path1, path2 = u'查看资产组', u'资产管理', u'查看资产组' keyword = request.GET.get('keyword', '') - gid = request.GET.get('gid') - sid = request.GET.get('sid') asset_group_list = AssetGroup.objects.all() if keyword: @@ -211,6 +208,7 @@ def asset_edit(request): ip = request.POST.get('ip', '') hostname = request.POST.get('hostname', '') password = request.POST.get('password', '') + is_active = True if request.POST.get('is_active') == '1' else False use_default_auth = request.POST.get('use_default_auth', '') try: @@ -230,6 +228,7 @@ def asset_edit(request): if password_old != password: password_encode = CRYPTOR.encrypt(password) af_save.password = password_encode + af_save.is_active = True if is_active else False af_save.save() af_post.save_m2m() # asset_new = get_object(Asset, id=asset_id) @@ -250,6 +249,7 @@ def asset_list(request): """ asset list view """ + header_title, path1, path2 = u'查看资产', u'资产管理', u'查看资产' idc_all = IDC.objects.filter() asset_group_all = AssetGroup.objects.all() asset_types = ASSET_TYPE @@ -382,9 +382,8 @@ def asset_edit_batch(request): asset.save() if alert_list: - username = unicode(name) + ' - ' + u'批量' - print alert_list - AssetRecord.objects.create(asset=asset, username=username, content=alert_list) + recode_name = unicode(name) + ' - ' + u'批量' + AssetRecord.objects.create(asset=asset, username=recode_name, content=alert_list) return HttpResponse('ok') return my_render('jasset/asset_edit_batch.html', locals(), request) @@ -410,21 +409,21 @@ def asset_update(request): """ asset_id = request.GET.get('id', '') asset = get_object(Asset, id=asset_id) + name = request.session.get('username', 'admin') if not asset: return HttpResponseRedirect('/jasset/asset_detail/?id=%s' % asset_id) - name = request.session.get('username', 'admin') if asset.use_default_auth: default = Setting.objects.all() if default: default = default[0] username = default.default_user - password = default.default_password + password = CRYPTOR.decrypt(default.default_password) port = default.default_port else: return HttpResponse(u'没有设置默认用户名和密码!') else: username = asset.username - password = asset.password + password = CRYPTOR.decrypt(asset.password) port = asset.port resource = [{"hostname": asset.ip, "port": port, @@ -436,7 +435,9 @@ def asset_update(request): asset_info = ansible_asset_info['result'][asset.ip] if asset_info: hostname = asset_info.get('hostname') - other_ip = ','.join(asset_info.get('other_ip')) + all_ip = asset_info.get('other_ip') + other_ip_list = all_ip.remove(asset.ip) if asset.ip in all_ip else [] + other_ip = ','.join(other_ip_list) if other_ip_list else '' cpu_type = asset_info.get('cpu_type')[1] cpu_cores = asset_info.get('cpu_cores') cpu = cpu_type + ' * ' + unicode(cpu_cores) diff --git a/static/files/excels/asset.xlsx b/static/files/excels/asset.xlsx deleted file mode 100644 index 1b92db891..000000000 Binary files a/static/files/excels/asset.xlsx and /dev/null differ diff --git a/static/files/excels/cmdb_excel_2015_11_14_11_38.xlsx b/static/files/excels/cmdb_excel_2015_11_14_11_38.xlsx deleted file mode 100644 index 7be819d90..000000000 Binary files a/static/files/excels/cmdb_excel_2015_11_14_11_38.xlsx and /dev/null differ diff --git a/static/files/excels/cmdb_excel_2015_11_14_11_39.xlsx b/static/files/excels/cmdb_excel_2015_11_14_11_39.xlsx deleted file mode 100644 index 831f40144..000000000 Binary files a/static/files/excels/cmdb_excel_2015_11_14_11_39.xlsx and /dev/null differ diff --git a/static/files/excels/cmdb_excel_2015_11_17_22_38.xlsx b/static/files/excels/cmdb_excel_2015_11_17_22_38.xlsx deleted file mode 100644 index 705c54347..000000000 Binary files a/static/files/excels/cmdb_excel_2015_11_17_22_38.xlsx and /dev/null differ diff --git a/static/files/excels/cmdb_excel_2015_11_17_22_39.xlsx b/static/files/excels/cmdb_excel_2015_11_17_22_39.xlsx deleted file mode 100644 index 83ea97d23..000000000 Binary files a/static/files/excels/cmdb_excel_2015_11_17_22_39.xlsx and /dev/null differ diff --git a/static/files/excels/cmdb_excel_2015_11_17_23_19.xlsx b/static/files/excels/cmdb_excel_2015_11_17_23_19.xlsx deleted file mode 100644 index 26eb98307..000000000 Binary files a/static/files/excels/cmdb_excel_2015_11_17_23_19.xlsx and /dev/null differ 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 deleted file mode 100644 index 2acd14d78..000000000 Binary files a/static/files/excels/cmdb_excel_2015_11_18_21_40.xlsx and /dev/null differ 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 deleted file mode 100644 index 8bbd94565..000000000 Binary files a/static/files/excels/cmdb_excel_2015_11_18_21_52.xlsx and /dev/null differ 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 deleted file mode 100644 index 5a0f01efc..000000000 Binary files a/static/files/excels/cmdb_excel_2015_11_18_21_53.xlsx and /dev/null differ 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 deleted file mode 100644 index e0b025cac..000000000 Binary files a/static/files/excels/cmdb_excel_2015_11_18_21_54.xlsx and /dev/null differ 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 deleted file mode 100644 index 77ff51aa5..000000000 Binary files a/static/files/excels/cmdb_excel_2015_11_18_22_17.xlsx and /dev/null differ 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 deleted file mode 100644 index 0c2778b89..000000000 Binary files a/static/files/excels/cmdb_excel_2015_11_19_22_05.xlsx and /dev/null differ diff --git a/templates/jasset/asset_detail.html b/templates/jasset/asset_detail.html index 4efb669a3..64b3e569f 100644 --- a/templates/jasset/asset_detail.html +++ b/templates/jasset/asset_detail.html @@ -29,14 +29,14 @@
- - - - + + + +
IP{{ asset.ip|default_if_none:"" }}
主机名 {{ asset.hostname|default_if_none:"" }}
IP{{ asset.ip|default_if_none:"" }}
其他IP diff --git a/templates/jasset/asset_edit.html b/templates/jasset/asset_edit.html index 2aa3711cc..0c36be788 100644 --- a/templates/jasset/asset_edit.html +++ b/templates/jasset/asset_edit.html @@ -77,7 +77,7 @@
- +
diff --git a/templates/jasset/asset_list.html b/templates/jasset/asset_list.html index 26572fa27..2ecf8f2bf 100644 --- a/templates/jasset/asset_list.html +++ b/templates/jasset/asset_list.html @@ -142,6 +142,7 @@
修改 + 更新
{% include 'paginator.html' %} diff --git a/templates/jasset/idc_list.html b/templates/jasset/idc_list.html index 05812783c..60cbbf607 100644 --- a/templates/jasset/idc_list.html +++ b/templates/jasset/idc_list.html @@ -30,6 +30,7 @@
添加IDC +
- {% ifequal session_role_id 2 %} - - - {% endifequal %} +
+ Showing {{ contacts.start_index }} to {{ contacts.end_index }} of {{ p.count }} entries +
{% include 'paginator.html' %}
diff --git a/templates/nav_li_profile.html b/templates/nav_li_profile.html index 5a277698c..9f879ba6b 100644 --- a/templates/nav_li_profile.html +++ b/templates/nav_li_profile.html @@ -36,7 +36,7 @@