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 branch 'develop' into feature

Browse Source
This commit is contained in:
jeremystretch
2022-03-18 13:34:31 -04:00
parent 8d53b46e82 f64987d0c4
commit 15005209d1
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-3.1.md
View File

@ -11,6 +11,7 @@
### Bug Fixes ### Bug Fixes
* [#8813](https://github.com/netbox-community/netbox/issues/8813) - Retain global search bar query after submitting
* [#8820](https://github.com/netbox-community/netbox/issues/8820) - Fix navbar background color in dark mode * [#8820](https://github.com/netbox-community/netbox/issues/8820) - Fix navbar background color in dark mode
* [#8850](https://github.com/netbox-community/netbox/issues/8850) - Show airflow field on device REST API serializer when config context data is included * [#8850](https://github.com/netbox-community/netbox/issues/8850) - Show airflow field on device REST API serializer when config context data is included

4
netbox/templates/base/layout.html
View File

@ -41,7 +41,7 @@ Blocks:
</button> </button>
</div> </div>
<div class="d-flex my-1 flex-grow-1 justify-content-center w-100"> <div class="d-flex my-1 flex-grow-1 justify-content-center w-100">
{% search_options %} {% search_options request %}
</div> </div>
</div> </div>
@ -53,7 +53,7 @@ Blocks:
{# Search bar #} {# Search bar #}
<div class="col-6 d-flex flex-grow-1 justify-content-center"> <div class="col-6 d-flex flex-grow-1 justify-content-center">
{% search_options %} {% search_options request %}
</div> </div>
{# Proflie/login button #} {# Proflie/login button #}

2
netbox/utilities/templates/search/searchbar.html
View File

@ -5,7 +5,7 @@
aria-label="Search" aria-label="Search"
placeholder="Search" placeholder="Search"
class="form-control" class="form-control"
value="{{ request.GET.q }}" value="{{ request.GET.q|escape }}"
/> />
<input name="obj_type" hidden type="text" class="search-obj-type" /> <input name="obj_type" hidden type="text" class="search-obj-type" />

7
netbox/utilities/templatetags/search.py
View File

@ -8,6 +8,9 @@ search_form = SearchForm()
@register.inclusion_tag("search/searchbar.html") @register.inclusion_tag("search/searchbar.html")
def search_options() -> Dict: def search_options(request) -> Dict:
"""Provide search options to template.""" """Provide search options to template."""
return {"options": search_form.options} return {
'options': search_form.options,
'request': request,
}