Просмотр исходного кода

Fix resetting column preferences

Jeremy Stretch 5 лет назад
Родитель
Сommit
00e102fb0c

+ 5 - 0
netbox/project-static/js/tableconfig.js

@@ -1,4 +1,9 @@
 $(document).ready(function() {
+    $('form.userconfigform input.reset').click(function(event) {
+        // Deselect all columns when the reset button is clicked
+        $('select[name="columns"]').val([]);
+    });
+
     $('form.userconfigform').submit(function(event) {
         event.preventDefault();
 

+ 2 - 2
netbox/templates/utilities/templatetags/table_config_form.html

@@ -17,8 +17,8 @@
                         </div>
                     </div>
                     <div class="text-right">
-                        <input type="submit" class="btn btn-primary" name="set" value="Save" />
-                        <input type="submit" class="btn btn-danger" name="clear" value="Reset" />
+                        <input type="submit" class="btn btn-primary" value="Save" />
+                        <input type="submit" class="btn btn-danger reset" value="Reset" />
                     </div>
                 </form>
             </div>

+ 1 - 0
netbox/utilities/forms/forms.py

@@ -161,6 +161,7 @@ class TableConfigForm(BootstrapMixin, forms.Form):
     """
     columns = forms.MultipleChoiceField(
         choices=[],
+        required=False,
         widget=forms.SelectMultiple(
             attrs={'size': 10}
         ),

+ 1 - 1
netbox/utilities/tables.py

@@ -41,7 +41,7 @@ class BaseTable(tables.Table):
         # Apply custom column ordering for user
         if user is not None and not isinstance(user, AnonymousUser):
             columns = user.config.get(f"tables.{self.__class__.__name__}.columns")
-            if columns is not None:
+            if columns:
                 pk = self.base_columns.pop('pk', None)
                 actions = self.base_columns.pop('actions', None)