From c5666f1357a90b9c6738fc49807291ff15b35b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B3=E4=B9=A6=E5=83=AE?= Date: Fri, 24 Mar 2017 10:37:05 +0800 Subject: [PATCH 1/3] fix some files --- .../templates/assets/asset_group_create.html | 1 - .../templates/assets/asset_modal_list.html | 64 +++++++++---------- .../templates/assets/asset_modal_update.html | 42 ++++++------ apps/assets/views.py | 5 +- 4 files changed, 52 insertions(+), 60 deletions(-) diff --git a/apps/assets/templates/assets/asset_group_create.html b/apps/assets/templates/assets/asset_group_create.html index f2dbfd3ee..49654bb8a 100644 --- a/apps/assets/templates/assets/asset_group_create.html +++ b/apps/assets/templates/assets/asset_group_create.html @@ -99,7 +99,6 @@ keyboard: 'false', remote:"{% url 'assets:asset-modal-list' %}?group_id={{ group_id }}" }); - $('#modal').on('show.bs.modal',function(){ //alert('当调用show方法时，立即触发；') }); diff --git a/apps/assets/templates/assets/asset_modal_list.html b/apps/assets/templates/assets/asset_modal_list.html index c24452c0e..5f86a00e1 100644 --- a/apps/assets/templates/assets/asset_modal_list.html +++ b/apps/assets/templates/assets/asset_modal_list.html @@ -14,26 +14,22 @@ id 资产名称 IP - 硬件类型 - 资产组 - 部门 + 类型 {% for asset in asset_modal_list %} {% if asset.id in all_assets %} - - + + {% else %} - + {% endif %} {{ asset.id }} {{ asset.hostname }} {{ asset.ip }} - 虚拟机 - 网络设备 - 微信事业部 + {{ asset.env }}-{{ asset.type }} {% endfor %} @@ -61,9 +57,7 @@ $(document).ready(function(){ {data: "id"}, {data: "hostname"}, {data: "ip"}, - {data: "type"}, - {data: "group"}, - {data: "dp"} + {data: "type"} ] }); //将ID列隐藏 @@ -77,18 +71,18 @@ $(document).ready(function(){ }else{ $(this).addClass('selected'); this.children[0].children[0].checked=1; - }; + } }); $('#close-btn').on('click',function(){ $('#modal').modal('hide'); }); - var size_name = document.getElementById('asset_on_count').innerText + var size_name = document.getElementById('asset_on_count').innerText; $('#save-btn').on('click',function(){ //alert( table.rows('.selected').data().length +' row(s) selected' ); var d = table.rows('.selected').data(); var size = d.length; - var re = /\d+/ + var re = /\d+/; document.getElementById('add_asset').value = size; var str= size_name; var re=/\d+/g; @@ -109,25 +103,25 @@ $(document).ready(function(){ }); //$(document).ready - var bCheck = 1; - function checkAll(){ - if(bCheck){ - $("tr[name='oAssets']").each(function(){ - oCheckbox = this.children[0].children[0]; - $(this).toggleClass('selected',true); - oCheckbox.checked=1; - }); - document.getElementById('check_all').checked=1; - bCheck = 0; - }else{ - $("tr[name='oAssets']").each(function(){ - oCheckbox = this.children[0].children[0]; - $(this).toggleClass('selected',false); - oCheckbox.checked=0; - }); - document.getElementById('check_all').checked=0; - bCheck = 1; - }; - }; +var bCheck = 1; +function checkAll(){ + if(bCheck){ + $("tr[name='oAssets']").each(function(){ + oCheckbox = this.children[0].children[0]; + $(this).toggleClass('selected',true); + oCheckbox.checked=1; + }); + document.getElementById('check_all').checked=1; + bCheck = 0; + }else{ + $("tr[name='oAssets']").each(function(){ + oCheckbox = this.children[0].children[0]; + $(this).toggleClass('selected',false); + oCheckbox.checked=0; + }); + document.getElementById('check_all').checked=0; + bCheck = 1; + } +} diff --git a/apps/assets/templates/assets/asset_modal_update.html b/apps/assets/templates/assets/asset_modal_update.html index c7d9ec205..a27a67bee 100644 --- a/apps/assets/templates/assets/asset_modal_update.html +++ b/apps/assets/templates/assets/asset_modal_update.html @@ -43,11 +43,10 @@
- -
-

选择需要修改属性

-
- 全选 +
+

选择需要修改属性

+
+ 全选 端口 系统类型 机房 @@ -65,9 +64,8 @@ 资产环境 标签 备注 -
-
- +
+
@@ -130,15 +128,15 @@ $('.select2').select2(); $("#id_tags").select2({ tags: true, - maximumSelectionLength: 8, //最多能够选择的个数 + maximumSelectionLength: 8 //最多能够选择的个数 //closeOnSelect: false }); - }; + } function AddForm(obj,id_form) { var oHiddenForms = document.getElementById("ridd"); var parentElem = document.getElementById("add_form"); var oH = document.getElementById(id_form); - var oNew = oH.parentNode.parentNode + var oNew = oH.parentNode.parentNode; var aDiv = parentElem.getElementsByClassName('form-group'); if(oNew.parentNode.id=='ridd') { obj.className="tagBtn2 label label-warning"; @@ -148,15 +146,15 @@ oHiddenForms.appendChild(oNew); obj.className="tagBtn2 label label-default"; SetSelect2(); - }; - }; + } + } function ChangeBtnCss(class_var){ - var changebtns = $("#formlists").find("a[name='changebtn']") + var changebtns = $("#formlists").find("a[name='changebtn']"); for (var i=0; i {% endblock %} diff --git a/apps/assets/views.py b/apps/assets/views.py index 9d5adf464..1b848a1cf 100644 --- a/apps/assets/views.py +++ b/apps/assets/views.py @@ -206,7 +206,7 @@ class AssetModalListView(AdminUserRequiredMixin, ListView): else: plain_id_lists = [int(self.s)] context = { - 'all_assets' :plain_id_lists + 'all_assets': plain_id_lists } kwargs.update(context) if group_id: @@ -304,7 +304,8 @@ class AssetGroupUpdateView(AdminUserRequiredMixin, UpdateView): 'action': _('Create asset group'), 'assets_on_list': assets_all, 'assets_count': len(assets_all), - 'group_id':self.object.id, + 'group_id': self.object.id, + 'tags': Tag.objects.all() } kwargs.update(context) return super(AssetGroupUpdateView, self).get_context_data(**kwargs) From c931d3179bf7725622b8e563dad3e3420733bb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B3=E4=B9=A6=E5=83=AE?= Date: Fri, 24 Mar 2017 11:02:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E4=BA=A7?= =?UTF-8?q?=E7=BB=84=E6=9B=B4=E6=96=B0=E4=B8=AD=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=B7=B1=E9=80=89=E6=8B=A9=E7=9A=84=E8=B5=84=E4=BA=A7=E9=A1=B9?= =?UTF-8?q?=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/assets/asset_modal_list.html | 10 +++++----- apps/assets/views.py | 16 +++++++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/apps/assets/templates/assets/asset_modal_list.html b/apps/assets/templates/assets/asset_modal_list.html index 5f86a00e1..bd0147fb6 100644 --- a/apps/assets/templates/assets/asset_modal_list.html +++ b/apps/assets/templates/assets/asset_modal_list.html @@ -18,7 +18,7 @@ - {% for asset in asset_modal_list %} + {% for asset in assets %} {% if asset.id in all_assets %} @@ -26,10 +26,10 @@ {% endif %} - {{ asset.id }} - {{ asset.hostname }} - {{ asset.ip }} - {{ asset.env }}-{{ asset.type }} + {{ asset.id }} + {{ asset.hostname }} + {{ asset.ip }} + {{ asset.env }}-{{ asset.type }} {% endfor %} diff --git a/apps/assets/views.py b/apps/assets/views.py index 1b848a1cf..e89500c75 100644 --- a/apps/assets/views.py +++ b/apps/assets/views.py @@ -195,6 +195,7 @@ class AssetModalListView(AdminUserRequiredMixin, ListView): tag_id = self.request.GET.get('tag_id') plain_id_lists = self.request.GET.get('plain_id_lists') self.s = self.request.GET.get('plain_id_lists') + assets = Asset.objects.all() if "," in str(self.s): self.plain_id_lists = [int(x) for x in self.s.split(',')] else: @@ -206,19 +207,28 @@ class AssetModalListView(AdminUserRequiredMixin, ListView): else: plain_id_lists = [int(self.s)] context = { - 'all_assets': plain_id_lists + 'all_assets': plain_id_lists, + 'assets': assets } kwargs.update(context) if group_id: group = AssetGroup.objects.get(id=group_id) + print group context = { - 'all_assets': [x.id for x in group.assets.all()] + 'all_assets': [x.id for x in group.assets.all()], + 'assets': assets } kwargs.update(context) if tag_id: tag = Tag.objects.get(id=tag_id) context = { - 'all_assets': [x.id for x in tag.asset_set.all()] + 'all_assets': [x.id for x in tag.asset_set.all()], + 'assets': assets + } + kwargs.update(context) + else: + context = { + 'assets': assets } kwargs.update(context) return super(AssetModalListView, self).get_context_data(**kwargs) From e0179ea332350bd6a7f373b6f1db05f94c9825df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B3=E4=B9=A6=E5=83=AE?= Date: Fri, 24 Mar 2017 11:13:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B5=84=E4=BA=A7HTML?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=ADSystemUser=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=86=85=E5=AE=B9(=E8=A7=86=E5=9B=BE=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E7=9B=B8=E5=85=B3API=E6=9A=82=E6=97=B6=E6=9C=AA=E5=8A=A8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/templates/assets/asset_detail.html | 121 ++++++------------ .../templates/assets/system_user_list.html | 102 +++++++-------- 2 files changed, 90 insertions(+), 133 deletions(-) diff --git a/apps/assets/templates/assets/asset_detail.html b/apps/assets/templates/assets/asset_detail.html index f52c50dc0..81c4f7a69 100644 --- a/apps/assets/templates/assets/asset_detail.html +++ b/apps/assets/templates/assets/asset_detail.html @@ -173,21 +173,13 @@ - {% trans 'Test system users' %}: + {% trans 'Test system pingpong' %}: - - {% trans 'Repush system users' %}: - - - - - - @@ -230,41 +222,6 @@ -
-
- {% trans 'System users' %} -
-
- - - - - - - - - - - {% for system_user in system_users %} - - - - - {% endfor %} - -
- -
- -
{{ system_user.name }} - -
-
-
@@ -343,9 +300,9 @@ $(document).ready(function () { delete jumpserver.groups_selected[data.id] }) }) - .on('click', '#is_active', function () { - var the_url = '{% url "api-assets:asset-detail" pk=asset.id %}'; - var checked = $(this).prop('checked'); + .on('click', '#is_active', function () { + var the_url = '{% url "api-assets:asset-detail" pk=asset.id %}'; + var checked = $(this).prop('checked'); var body = { 'is_active': checked }; @@ -357,23 +314,23 @@ $(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_add_user_group', function () { - if (Object.keys(jumpserver.groups_selected).length === 0) { + .on('click', '#btn_add_user_group', function () { + if (Object.keys(jumpserver.groups_selected).length === 0) { return false; } - var groups = $('.bdg_group').map(function() { - return $(this).data('gid'); - }).get(); - $.map(jumpserver.groups_selected, function(value, index) { - groups.push(parseInt(index)); - $('#opt_' + index).remove(); - }); - updateAssetGroups(groups) + var groups = $('.bdg_group').map(function() { + return $(this).data('gid'); + }).get(); + $.map(jumpserver.groups_selected, function(value, index) { + groups.push(parseInt(index)); + $('#opt_' + index).remove(); + }); + updateAssetGroups(groups) }) .on('click', '.btn_leave_group', function() { var $this = $(this); @@ -391,33 +348,33 @@ $(document).ready(function () { updateAssetGroups(groups) }) .on('click', '.btn-system-user', function () { - if (Object.keys(jumpserver.groups_selected).length === 0) { + if (Object.keys(jumpserver.groups_selected).length === 0) { return false; } - var system_users = $('.bdg_group').map(function() { - return $(this).data('sid'); - }).get(); - $.map(jumpserver.groups_selected, function(value, index) { - system_users.push(parseInt(index)); - $('#opt_' + index).remove(); - }); - updateAssetSystem(system_users) + var system_users = $('.bdg_group').map(function() { + return $(this).data('sid'); + }).get(); + $.map(jumpserver.groups_selected, function(value, index) { + system_users.push(parseInt(index)); + $('#opt_' + index).remove(); + }); + updateAssetSystem(system_users) }) - .on('click', '.btn_leave_system', function () { - var $this = $(this); - var $tr = $this.closest('tr'); - var $badge = $tr.find('.bdg_group'); - var sid = $badge.data('sid'); - var name = $badge.html() || $badge.text(); - $('#groups_selected').append( - '' - ); - $tr.remove(); - var system_users = $('.bdg_group').map(function () { - return $(this).data('sid'); - }).get(); - updateAssetSystem(system_users) + .on('click', '.btn_leave_system', function () { + var $this = $(this); + var $tr = $this.closest('tr'); + var $badge = $tr.find('.bdg_group'); + var sid = $badge.data('sid'); + var name = $badge.html() || $badge.text(); + $('#groups_selected').append( + '' + ); + $tr.remove(); + var system_users = $('.bdg_group').map(function () { + return $(this).data('sid'); + }).get(); + updateAssetSystem(system_users) }) diff --git a/apps/assets/templates/assets/system_user_list.html b/apps/assets/templates/assets/system_user_list.html index 6a1a85884..e000779dd 100644 --- a/apps/assets/templates/assets/system_user_list.html +++ b/apps/assets/templates/assets/system_user_list.html @@ -26,62 +26,62 @@
-
- -
- -
-
+
+ +
+ +
+
{% endblock %} {% block custom_foot_js %}