From 7b795ac332c799b3583a660cea658e269888119d Mon Sep 17 00:00:00 2001
From: Matthew Smith <mattysmith22@googlemail.com>
Date: Sun, 6 Oct 2019 01:03:41 +0100
Subject: [PATCH] Fixed some bugs with search

---
 assets/templates/asset_list.html | 6 +++---
 assets/views.py                  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 3d1ed407..e3854b58 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -8,7 +8,7 @@
   <h1 class="text-center">Asset List</h1>
 </div>
 
-<form id="asset-search-form">
+<form id="asset-search-form" method="get">
   {% csrf_token %}
   <div class="input-group">
     <input type="query" name="query" placeholder="Search by Asset ID/Description" class="form-control" value="{{search_name}}">
@@ -20,7 +20,7 @@
     <select name="cat" class="form-control">
           <option value="">None</option>
           {% for name in categories %}
-          {% if name == category_select %}
+          {% if name.name == category_select %}
           <option selected>
           {% else %}
           <option>
@@ -35,7 +35,7 @@
     <select name="status" class="form-control">
     <option value="">None</option>
             {% for name in statuses %}
-            {% if name == status_select %}
+            {% if name.name == status_select %}
             <option selected>
             {% else %}
             <option>
diff --git a/assets/views.py b/assets/views.py
index daf81058..3a6c7536 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -36,7 +36,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
         status = self.request.GET.get('status', "")
         if cat != "":
             queryset = queryset.filter(category__name__exact=cat)
-        elif status != "":
+        if status != "":
             queryset = queryset.filter(status__name__exact=status)
 
         return queryset
@@ -49,7 +49,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
         context["category_select"] = self.request.GET.get('cat', "")
 
         context["statuses"] = models.AssetStatus.objects.all()
-        context["status_select"] = self.request.GET.get('stats', "")
+        context["status_select"] = self.request.GET.get('status', "")
         return context;
 
 class AssetSearch(AssetList):