mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fix resetting column preferences

Browse Source
This commit is contained in:
Jeremy Stretch
2020-10-29 14:42:40 -04:00
parent a43361170c
commit 00e102fb0c
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/project-static/js/tableconfig.js
View File

@ -1,4 +1,9 @@
$(document).ready(function() { $(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) { $('form.userconfigform').submit(function(event) {
event.preventDefault(); event.preventDefault();

4
netbox/templates/utilities/templatetags/table_config_form.html
View File

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

1
netbox/utilities/forms/forms.py
View File

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

2
netbox/utilities/tables.py
View File

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