From 16f222b0ab114475649a448a0dad61e6375aaf57 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Tue, 30 Jan 2018 12:11:20 -0500
Subject: [PATCH] Closes #1366: Enable searching for regions by name/slug

---
 netbox/dcim/filters.py                 | 13 +++++++++++++
 netbox/dcim/forms.py                   |  5 +++++
 netbox/dcim/views.py                   |  2 ++
 netbox/templates/dcim/region_list.html |  5 ++++-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/netbox/dcim/filters.py b/netbox/dcim/filters.py
index e56a12ac0..c3ef82704 100644
--- a/netbox/dcim/filters.py
+++ b/netbox/dcim/filters.py
@@ -22,6 +22,10 @@ from .models import (
 
 
 class RegionFilter(django_filters.FilterSet):
+    q = django_filters.CharFilter(
+        method='search',
+        label='Search',
+    )
     parent_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Region.objects.all(),
         label='Parent region (ID)',
@@ -37,6 +41,15 @@ class RegionFilter(django_filters.FilterSet):
         model = Region
         fields = ['name', 'slug']
 
+    def search(self, queryset, name, value):
+        if not value.strip():
+            return queryset
+        qs_filter = (
+            Q(name__icontains=value) |
+            Q(slug__icontains=value)
+        )
+        return queryset.filter(qs_filter)
+
 
 class SiteFilter(CustomFieldFilterSet, django_filters.FilterSet):
     id__in = NumericInFilter(name='id', lookup_expr='in')
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index e051e33e5..ebe10942a 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -81,6 +81,11 @@ class RegionCSVForm(forms.ModelForm):
         }
 
 
+class RegionFilterForm(BootstrapMixin, forms.Form):
+    model = Site
+    q = forms.CharField(required=False, label='Search')
+
+
 #
 # Sites
 #
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 0dc393cfb..b0b5beae3 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -80,6 +80,8 @@ class BulkDisconnectView(View):
 
 class RegionListView(ObjectListView):
     queryset = Region.objects.annotate(site_count=Count('sites'))
+    filter = filters.RegionFilter
+    filter_form = forms.RegionFilterForm
     table = tables.RegionTable
     template_name = 'dcim/region_list.html'
 
diff --git a/netbox/templates/dcim/region_list.html b/netbox/templates/dcim/region_list.html
index 73fddbb0a..4d61b4acb 100644
--- a/netbox/templates/dcim/region_list.html
+++ b/netbox/templates/dcim/region_list.html
@@ -17,8 +17,11 @@
 </div>
 <h1>{% block title %}Regions{% endblock %}</h1>
 <div class="row">
-	<div class="col-md-12">
+	<div class="col-md-9">
         {% include 'utilities/obj_table.html' with bulk_delete_url='dcim:region_bulk_delete' %}
     </div>
+	<div class="col-md-3">
+		{% include 'inc/search_panel.html' %}
+	</div>
 </div>
 {% endblock %}