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

Merge pull request #4022 from hSaria/4010-interface-ip-filter

Browse Source 
Fixes #4010: Fixes IP addresses table when filtering interfaces
This commit is contained in:
Jeremy Stretch
2020-01-28 13:54:21 -05:00
committed by GitHub
parent 2a4ccae113 5c5b9c95aa
commit 12cf69f7e1
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
netbox/project-static/js/interface_toggles.js
View File

@ -2,9 +2,9 @@
$('button.toggle-ips').click(function() { $('button.toggle-ips').click(function() {
var selected = $(this).attr('selected'); var selected = $(this).attr('selected');
if (selected) { if (selected) {
$('#interfaces_table tr.ipaddresses').hide(); $('#interfaces_table tr.interface:visible + tr.ipaddresses').hide();
} else { } else {
$('#interfaces_table tr.ipaddresses').show(); $('#interfaces_table tr.interface:visible + tr.ipaddresses').show();
} }
$(this).attr('selected', !selected); $(this).attr('selected', !selected);
$(this).children('span').toggleClass('glyphicon-check glyphicon-unchecked'); $(this).children('span').toggleClass('glyphicon-check glyphicon-unchecked');
@ -14,17 +14,22 @@ $('button.toggle-ips').click(function() {
// Inteface filtering // Inteface filtering
$('input.interface-filter').on('input', function() { $('input.interface-filter').on('input', function() {
var filter = new RegExp(this.value); var filter = new RegExp(this.value);
var interface;
for (interface of $(this).closest('div.panel').find('tbody > tr')) { for (interface of $('#interfaces_table > tbody > tr.interface')) {
// Slice off 'interface_' at the start of the ID // Slice off 'interface_' at the start of the ID
if (filter && filter.test(interface.id.slice(10))) { if (filter.test(interface.id.slice(10))) {
// Match the toggle in case the filter now matches the interface // Match the toggle in case the filter now matches the interface
$(interface).find('input:checkbox[name=pk]').prop('checked', $('input.toggle').prop('checked')); $(interface).find('input:checkbox[name=pk]').prop('checked', $('input.toggle').prop('checked'));
$(interface).show(); $(interface).show();
if ($('button.toggle-ips').attr('selected')) {
$(interface).next('tr.ipaddresses').show();
}
} else { } else {
// Uncheck to prevent actions from including it when it doesn't match // Uncheck to prevent actions from including it when it doesn't match
$(interface).find('input:checkbox[name=pk]').prop('checked', false); $(interface).find('input:checkbox[name=pk]').prop('checked', false);
$(interface).hide(); $(interface).hide();
$(interface).next('tr.ipaddresses').hide();
} }
} }
}); });