[Update] 修复小细节 (#2111)

* [Update] 命令/录像存储，禁用default删除按钮

* [Update] 修复 _asset_list_modal 取消资产全选时不能映射到资产选择框的bug

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');
 
 })

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) {
+    $('.select2').val(assets).trigger('change');
-        assets.push($(data).attr('value'))
-    });
-    $.each(assets, function (id, data) {
-        $('.select2').val(assets).trigger('change');
-    });
     $("#asset_list_modal").modal('hide');
 })
 </script>

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

apps/common/templates/common/terminal_setting.html

@@ -87,7 +87,7 @@
                                             <tr>
                                                 <td>{{ name }}</td>
                                                 <td>{{ setting.TYPE }}</td>
-                                                <td><a class="btn btn-xs btn-danger m-l-xs btn-del-command" data-name="{{ name }}">{% trans 'Delete' %}</a></td>
+                                                <td><a class="btn btn-xs btn-danger m-l-xs btn-del-command"  {% if setting.TYPE == 'server' and name == 'default' %} disabled {% endif %} data-name="{{ name }}">{% trans 'Delete' %}</a></td>
                                             </tr>
                                         {% endfor %}
                                         </tbody>
@@ -109,7 +109,7 @@
                                             <tr>
                                                 <td>{{ name }}</td>
                                                 <td>{{ setting.TYPE }}</td>
-                                                <td><a class="btn btn-xs btn-danger m-l-xs btn-del-replay" data-name="{{ name }}">{% trans 'Delete' %}</a></td>
+                                                <td><a class="btn btn-xs btn-danger m-l-xs btn-del-replay" {% if setting.TYPE == 'server' and name == 'default' %} disabled {% endif %} data-name="{{ name }}">{% trans 'Delete' %}</a></td>
                                             </tr>
                                         {% endfor %}
                                         </tbody>

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'))
+    $('.select2').val(assets).trigger('change');
-    });
+
-    $.each(assets, function (id, data) {
-        $('.select2').val(assets).trigger('change');
-    });
     $("#asset_list_modal").modal('hide');
 });
 </script>

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)
                 }
             })