From 406a9dad363bd018687085f78b8d322efa74b4b4 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Thu, 2 Jan 2020 18:34:38 +0000
Subject: [PATCH] FEAT #386: Asset search searches serial number.

Pending addition of advanced search.
---
 assets/filters.py                | 2 +-
 assets/templates/asset_list.html | 4 ++--
 assets/views.py                  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/filters.py b/assets/filters.py
index c7efcd7f..b7cc8ffa 100644
--- a/assets/filters.py
+++ b/assets/filters.py
@@ -6,4 +6,4 @@ from assets import models
 class AssetFilter(django_filters.FilterSet):
     class Meta:
         model = models.Asset
-        fields = ['asset_id', 'description', 'category', 'status']
+        fields = ['asset_id', 'description', 'serial_number', 'category', 'status']
diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 4c86d58d..90bb2346 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -11,8 +11,8 @@
 
 <form id="asset-search-form" method="get" class="form-inline pull-right">
   <div class="input-group pull-right" style="width: auto;">
-    {% render_field form.query|add_class:'form-control' placeholder='Search by Asset ID/Description' style="width: 250px"%}
-    <label for="query" class="sr-only">Asset ID/Description:</label>
+    {% render_field form.query|add_class:'form-control' placeholder='Search by Asset ID/Desc/Serial' style="width: 250px"%}
+    <label for="query" class="sr-only">Asset ID/Description/Serial Number:</label>
     <span class="input-group-btn"><button type="submit" class="btn btn-default">Search</button></span>
   </div>
   <br>
diff --git a/assets/views.py b/assets/views.py
index 1acc28fb..395daac2 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -39,7 +39,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
             queryset = self.model.objects.all()
         elif len(query_string) >= 3:
             queryset = self.model.objects.filter(
-                Q(asset_id__exact=query_string) | Q(description__icontains=query_string))
+                Q(asset_id__exact=query_string) | Q(description__icontains=query_string) | Q(serial_number__exact=query_string))
         else:
             queryset = self.model.objects.filter(Q(asset_id__exact=query_string))