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

Addressed PR comments

Browse Source
This commit is contained in:
Julio-Oliveira-Encora 2024-05-20 16:07:57 -03:00
commit 1157a27467
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/project-static/src/search.ts
View File

@ -11,7 +11,6 @@ function quickSearchEventHandler(event: Event): void {
if (isTruthy(clearbtn)) { if (isTruthy(clearbtn)) {
if (quicksearch.value === "") { if (quicksearch.value === "") {
clearbtn.classList.add("invisible"); clearbtn.classList.add("invisible");
clearLinkParams();
} else { } else {
clearbtn.classList.remove("invisible"); clearbtn.classList.remove("invisible");
} }

2
netbox/templates/inc/table_controls_htmx.html
View File

@ -5,7 +5,7 @@
<div class="col-auto d-print-none"> <div class="col-auto d-print-none">
<div class="input-group input-group-flat me-2 quicksearch" hx-disinherit="hx-select hx-swap"> <div class="input-group input-group-flat me-2 quicksearch" hx-disinherit="hx-select hx-swap">
<input type="search" results="5" name="q" id="quicksearch" class="form-control px-2 py-1" placeholder="Quick search" <input type="search" results="5" name="q" id="quicksearch" class="form-control px-2 py-1" placeholder="Quick search"
hx-get="{{ request.full_path }}" hx-target="#object_list" hx-trigger="keyup changed delay:500ms, search" /> hx-get="{{ request.full_path }}" hx-target="#object_list" hx-trigger="keyup changed delay:500ms, search" id="quicksearch" />
<span class="input-group-text py-1"> <span class="input-group-text py-1">
<a href="#" id="quicksearch_clear" class="invisible text-secondary"><i class="mdi mdi-close-circle"></i></a> <a href="#" id="quicksearch_clear" class="invisible text-secondary"><i class="mdi mdi-close-circle"></i></a>
</span> </span>

2
netbox/utilities/forms/fields/dynamic.py
View File

@ -197,6 +197,6 @@ class DynamicModelMultipleChoiceField(DynamicModelChoiceMixin, forms.ModelMultip
# string 'null'. This will check for that condition and gracefully handle the conversion to a NoneType. # string 'null'. This will check for that condition and gracefully handle the conversion to a NoneType.
if self.null_option is not None and settings.FILTERS_NULL_CHOICE_VALUE in value: if self.null_option is not None and settings.FILTERS_NULL_CHOICE_VALUE in value:
value = [v for v in value if v != settings.FILTERS_NULL_CHOICE_VALUE] value = [v for v in value if v != settings.FILTERS_NULL_CHOICE_VALUE]
return [None, *super().clean(value)] return [None, *value]
return super().clean(value) return super().clean(value)