NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-09 00:58:16 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge branch '3377-recursive-power-calc' of https://github.com/hSaria/netbox into 3377-recursive-power-calc

Browse Source
This commit is contained in:
Saria Hajjar 2020-01-14 14:04:53 +00:00
commit b8693ca6a2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/release-notes/version-2.6.md
View File

@ -4,6 +4,10 @@
* [#3377](https://github.com/netbox-community/netbox/issues/3377) - Include children devices when calculating power utilization * [#3377](https://github.com/netbox-community/netbox/issues/3377) - Include children devices when calculating power utilization
## Bug Fixes
* [#3914](https://github.com/netbox-community/netbox/issues/3914) - Fix interface filter field when unauthenticated
--- ---
# v2.6.12 (2020-01-13) # v2.6.12 (2020-01-13)

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

@ -15,7 +15,7 @@ $('button.toggle-ips').click(function() {
$('input.interface-filter').on('input', function() { $('input.interface-filter').on('input', function() {
var filter = new RegExp(this.value); var filter = new RegExp(this.value);
for (interface of $(this).closest('form').find('tbody > tr')) { for (interface of $(this).closest('div.panel').find('tbody > tr')) {
// 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 && 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