From 8f479e364b69602c17a29b9f71ed9210c3a2a4be Mon Sep 17 00:00:00 2001 From: BaiJiangJie <32935519+BaiJiangJie@users.noreply.github.com> Date: Thu, 29 Nov 2018 16:01:03 +0800 Subject: [PATCH] =?UTF-8?q?[Update]=20=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=BB=86?= =?UTF-8?q?=E8=8A=82=20(#2111)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [Update] 命令/录像存储，禁用default删除按钮 * [Update] 修复 _asset_list_modal 取消资产全选时不能映射到资产选择框的bug --- apps/assets/templates/assets/domain_create_update.html | 4 +--- apps/assets/templates/assets/label_create_update.html | 7 +------ apps/common/models.py | 10 ++++++++++ apps/common/templates/common/terminal_setting.html | 4 ++-- .../perms/asset_permission_create_update.html | 9 +++------ apps/static/js/jumpserver.js | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/apps/assets/templates/assets/domain_create_update.html b/apps/assets/templates/assets/domain_create_update.html index 3ad8724e9..8af8728c8 100644 --- a/apps/assets/templates/assets/domain_create_update.html +++ b/apps/assets/templates/assets/domain_create_update.html @@ -32,9 +32,7 @@ $(document).ready(function () { }) .on('click', '#btn_asset_modal_confirm', function () { var assets = asset_table2.selected; - $.each(assets, function (id, data) { - $('.select2').val(assets).trigger('change'); - }); + $('.select2').val(assets).trigger('change'); $("#asset_list_modal").modal('hide'); }) diff --git a/apps/assets/templates/assets/label_create_update.html b/apps/assets/templates/assets/label_create_update.html index b26ec6464..0ff094e69 100644 --- a/apps/assets/templates/assets/label_create_update.html +++ b/apps/assets/templates/assets/label_create_update.html @@ -35,12 +35,7 @@ $(document).ready(function () { }) .on('click', '#btn_asset_modal_confirm', function () { var assets = asset_table2.selected; - $('.select2 option:selected').each(function (i, data) { - assets.push($(data).attr('value')) - }); - $.each(assets, function (id, data) { - $('.select2').val(assets).trigger('change'); - }); + $('.select2').val(assets).trigger('change'); $("#asset_list_modal").modal('hide'); }) diff --git a/apps/common/models.py b/apps/common/models.py index a864e9535..cc5ba8fc5 100644 --- a/apps/common/models.py +++ b/apps/common/models.py @@ -64,6 +64,11 @@ class Setting(models.Model): @classmethod def save_storage(cls, name, data): + """ + :param name: TERMINAL_REPLAY_STORAGE or TERMINAL_COMMAND_STORAGE + :param data: {} + :return: Setting object + """ obj = cls.objects.filter(name=name).first() if not obj: obj = cls() @@ -79,6 +84,11 @@ class Setting(models.Model): @classmethod def delete_storage(cls, name, storage_name): + """ + :param name: TERMINAL_REPLAY_STORAGE or TERMINAL_COMMAND_STORAGE + :param storage_name: "" + :return: bool + """ obj = cls.objects.filter(name=name).first() if not obj: return False diff --git a/apps/common/templates/common/terminal_setting.html b/apps/common/templates/common/terminal_setting.html index 0069c05a2..994d1714b 100644 --- a/apps/common/templates/common/terminal_setting.html +++ b/apps/common/templates/common/terminal_setting.html @@ -87,7 +87,7 @@ {{ name }} {{ setting.TYPE }} - {% trans 'Delete' %} + {% trans 'Delete' %} {% endfor %} @@ -109,7 +109,7 @@ {{ name }} {{ setting.TYPE }} - {% trans 'Delete' %} + {% trans 'Delete' %} {% endfor %} diff --git a/apps/perms/templates/perms/asset_permission_create_update.html b/apps/perms/templates/perms/asset_permission_create_update.html index 2d79890f6..0b2c5b93e 100644 --- a/apps/perms/templates/perms/asset_permission_create_update.html +++ b/apps/perms/templates/perms/asset_permission_create_update.html @@ -112,12 +112,9 @@ $(document).ready(function () { }) .on('click', '#btn_asset_modal_confirm', function () { var assets = asset_table2.selected; - $('.select2 option:selected').each(function (i, data) { - assets.push($(data).attr('value')) - }); - $.each(assets, function (id, data) { - $('.select2').val(assets).trigger('change'); - }); + + $('.select2').val(assets).trigger('change'); + $("#asset_list_modal").modal('hide'); }); diff --git a/apps/static/js/jumpserver.js b/apps/static/js/jumpserver.js index 466267c33..b3cec3bd7 100644 --- a/apps/static/js/jumpserver.js +++ b/apps/static/js/jumpserver.js @@ -535,7 +535,7 @@ jumpserver.initServerSideDataTable = function (options) { if (type === 'row') { var rows = table.rows(indexes).data(); $.each(rows, function (id, row) { - if (row.id){ + if (row.id && $.inArray(row.id, table.selected) === -1){ table.selected.push(row.id) } })