NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop' into 3762-datetime-selectors

Browse Source
This commit is contained in:
Jeremy Stretch 2019-12-30 12:31:50 -05:00 committed by GitHub
commit b5177c608d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 3 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

@ -3,11 +3,13 @@
## Enhancements ## Enhancements
* [#3705](https://github.com/netbox-community/netbox/issues/3705) - Provide request context when executing custom scripts * [#3705](https://github.com/netbox-community/netbox/issues/3705) - Provide request context when executing custom scripts
* [#3762](https://github.com/netbox-community/netbox/issues/3762) - Added date/time pickers * [#3762](https://github.com/netbox-community/netbox/issues/3762) - Add date/time picker widgets
* [#3788](https://github.com/netbox-community/netbox/issues/3788) - Enable partial search for inventory items
## Bug Fixes ## Bug Fixes
* [#3695](https://github.com/netbox-community/netbox/issues/3695) - Include A/Z termination sites for circuits in global search * [#3695](https://github.com/netbox-community/netbox/issues/3695) - Include A/Z termination sites for circuits in global search
* [#3712](https://github.com/netbox-community/netbox/issues/3712) - Scrolling to target (hash) did not account for the header size
* [#3780](https://github.com/netbox-community/netbox/issues/3780) - Fix AttributeError exception in API docs * [#3780](https://github.com/netbox-community/netbox/issues/3780) - Fix AttributeError exception in API docs
--- ---

4
netbox/dcim/filters.py
View File

@ -868,8 +868,8 @@ class InventoryItemFilter(DeviceComponentFilterSet):
qs_filter = ( qs_filter = (
Q(name__icontains=value) | Q(name__icontains=value) |
Q(part_id__icontains=value) | Q(part_id__icontains=value) |
Q(serial__iexact=value) | Q(serial__icontains=value) |
Q(asset_tag__iexact=value) | Q(asset_tag__icontains=value) |
Q(description__icontains=value) Q(description__icontains=value)
) )
return queryset.filter(qs_filter) return queryset.filter(qs_filter)

15
netbox/project-static/js/forms.js
View File

@ -371,4 +371,19 @@ $(document).ready(function() {
}); });
$('select#id_mode').trigger('change'); $('select#id_mode').trigger('change');
} }
// Scroll up an offset equal to the first nav element if a hash is present
// Cannot use '#navbar' because it is not always visible, like in small windows
function headerOffsetScroll() {
if (window.location.hash) {
// Short wait needed to allow the page to scroll to the element
setTimeout(function() {
window.scrollBy(0, -$('nav').height())
}, 10);
}
}
// Account for the header height when hash-scrolling
window.addEventListener('load', headerOffsetScroll);
window.addEventListener('hashchange', headerOffsetScroll);
}); });