Closes #7239: Redirect global search to filtered object list when an object type is selected

Author: jeremystretch

docs/release-notes/version-3.0.md

@@ -2,6 +2,10 @@
 
 ## v3.0.3 (FUTURE)
 
+### Enhancements
+
+* [#7239](https://github.com/netbox-community/netbox/issues/7239) - Redirect global search to filtered object list when an object type is selected
+
 ### Bug Fixes
 
 * [#7167](https://github.com/netbox-community/netbox/issues/7167) - Ensure consistent font size when using monospace formatting

netbox/netbox/views/__init__.py

@@ -26,7 +26,6 @@
 from netbox.constants import SEARCH_MAX_RESULTS, SEARCH_TYPES
 from netbox.forms import SearchForm
 from tenancy.models import Tenant
-from utilities.tables import paginate_table
 from virtualization.models import Cluster, VirtualMachine
 
 
@@ -154,26 +153,18 @@ def build_stats():
 class SearchView(View):
 
     def get(self, request):
-
-        # No query
-        if 'q' not in request.GET:
-            return render(request, 'search.html', {
-                'form': SearchForm(),
-            })
-
         form = SearchForm(request.GET)
         results = []
 
         if form.is_valid():
 
+            # If an object type has been specified, redirect to the dedicated view for it
             if form.cleaned_data['obj_type']:
-                # Searching for a single type of object
-                obj_types = [form.cleaned_data['obj_type']]
-            else:
-                # Searching all object types
-                obj_types = SEARCH_TYPES.keys()
+                object_type = form.cleaned_data['obj_type']
+                url = reverse(SEARCH_TYPES[object_type]['url'])
+                return redirect(f"{url}?q={form.cleaned_data['q']}")
 
-            for obj_type in obj_types:
+            for obj_type in SEARCH_TYPES.keys():
 
                 queryset = SEARCH_TYPES[obj_type]['queryset'].restrict(request.user, 'view')
                 filterset = SEARCH_TYPES[obj_type]['filterset']

netbox/templates/search.html

@@ -54,7 +54,7 @@ <h3 class="text-muted text-center">No results found</h3>
         {% endif %}
     {% else %}
         <div class="row">
-            <div class="col col-12 col-lg-4 offset-lg-4">
+            <div class="col col-12 col-lg-6 offset-lg-3">
                 <form action="{% url 'search' %}" method="get" class="form form-horizontal">
                     <div class="card">
                         <h5 class="card-header">