From ed5339925e4b8d4da1ac447bc4e356ecfd4e4bbd Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Sun, 16 Feb 2020 02:41:36 +0000
Subject: [PATCH] FIX: Revert partialising of asset search

---
 assets/templates/asset_list.html            | 21 +++++++++++++++-
 assets/templates/partials/asset_search.html | 28 ---------------------
 2 files changed, 20 insertions(+), 29 deletions(-)
 delete mode 100644 assets/templates/partials/asset_search.html

diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 926e2342..cbd27b28 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -9,7 +9,26 @@
   <h1 class="text-center">Asset List</h1>
 </div>
 
-{% include 'partials/asset_search.html' %}
+<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/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>
+  <div style="margin-top: 1em;" class="pull-right">
+      <div id="category-group" class="form-group">
+        <label for="category" class="sr-only">Category</label>
+        {% render_field form.category|attr:'multiple'|add_class:'form-control selectpicker' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
+      </div>
+      <div id="status-group" class="form-group">
+        <label for="status" class="sr-only">Status</label>
+        {% render_field form.status|attr:'multiple'|add_class:'form-control selectpicker' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
+      </div>
+      <!---TODO: Auto filter whenever an option is selected, instead of using a button -->
+      <button id="filter-submit" type="submit" class="btn btn-default">Filter</button>
+    </div>
+</form>
 
 <table class="table">
   <thead>
diff --git a/assets/templates/partials/asset_search.html b/assets/templates/partials/asset_search.html
deleted file mode 100644
index fae4e7cf..00000000
--- a/assets/templates/partials/asset_search.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends request.is_ajax|yesno:'base_ajax.html,base_assets.html' %}
-
-{% load widget_tweaks %}
-
-{% block title %}Asset Search{% endblock %}
-
-{% block content %}
-<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/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>
-  <div style="margin-top: 1em;" class="pull-right">
-      <div id="category-group" class="form-group">
-        <label for="category" class="sr-only">Category</label>
-        {% render_field form.category|attr:'multiple'|add_class:'form-control selectpicker' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
-      </div>
-      <div id="status-group" class="form-group">
-        <label for="status" class="sr-only">Status</label>
-        {% render_field form.status|attr:'multiple'|add_class:'form-control selectpicker' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
-      </div>
-      <!---TODO: Auto filter whenever an option is selected, instead of using a button -->
-      <button id="filter-submit" type="submit" class="btn btn-default">Filter</button>
-    </div>
-</form>
-{% endblock %}