From f69a13e05b7e956b7c66ec3369033c3ede0711f2 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 18 Oct 2022 08:17:35 -0400 Subject: [PATCH] Remove object type selector from search bar --- netbox/netbox/forms/__init__.py | 25 ++------- netbox/project-static/dist/netbox.js | Bin 381426 -> 380899 bytes netbox/project-static/dist/netbox.js.map | Bin 354103 -> 353676 bytes netbox/project-static/src/netbox.ts | 4 +- netbox/project-static/src/search.ts | 51 +----------------- netbox/templates/base/layout.html | 5 +- netbox/templates/inc/searchbar.html | 6 +++ .../utilities/templates/search/searchbar.html | 49 ----------------- netbox/utilities/templatetags/search.py | 18 ------- 9 files changed, 15 insertions(+), 143 deletions(-) create mode 100644 netbox/templates/inc/searchbar.html delete mode 100644 netbox/utilities/templates/search/searchbar.html delete mode 100644 netbox/utilities/templatetags/search.py diff --git a/netbox/netbox/forms/__init__.py b/netbox/netbox/forms/__init__.py index 14e4d0566..daa5cf904 100644 --- a/netbox/netbox/forms/__init__.py +++ b/netbox/netbox/forms/__init__.py @@ -15,21 +15,10 @@ LOOKUP_CHOICES = ( ) -def build_options(choices): - options = [{"label": choices[0][1], "items": []}] - - for label, choices in choices[1:]: - items = [] - - for value, choice_label in choices: - items.append({"label": choice_label, "value": value}) - - options.append({"label": label, "items": items}) - return options - - class SearchForm(BootstrapMixin, forms.Form): - q = forms.CharField(label='Search') + q = forms.CharField( + label='Search' + ) obj_types = forms.MultipleChoiceField( choices=[], required=False, @@ -43,15 +32,7 @@ class SearchForm(BootstrapMixin, forms.Form): widget=StaticSelect() ) - options = None - def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.fields['obj_types'].choices = search_backend.get_object_types() - - def get_options(self): - if not self.options: - self.options = build_options(search_backend.get_object_types()) - - return self.options diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js index 1213d719fba8177f84c950cec2ee3e75190db002..19cdae0bd318381cbc0701ff151e7f87ad3ae9ee 100644 GIT binary patch delta 8423 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 a-7Fr7f9htx$M==5x=}TR(MQ;u%cC%>=ZWA{i89 delta 479 zcmYk2y-EX75QT}G2M{Ekpx8Q~;!kYPo$Q7+EbFqaG3BzTNn90wKur^ih>d;lJpyU1 z6R=L>yEt=Kqs=h)yEA9b%-ggw{;WI?N`r-wvoh(og9B;-mrQja)6ijJ9OWK`NL&R0 z`9QPCGH};udTwLUme7s?S8K{oHC$V@gr4TuD#w%pDcuOYw-rt5*WsQK0G}Gbg`oh5 zH0@~0RrMl&q8TfdsS;Cp^CSP-;uHPPC;?hx8X;xCAw|HQk;rXpEG?vcxVPr7bM;@V z?6zgM`YCN7**3$qiSyFWS*@=dal=)kLz*hrQlWiA53