arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-02 05:12:16 +00:00
Code Issues Projects Releases Wiki Activity

Fixed some bugs with search

Browse Source
This commit is contained in:
Matthew Smith
2019-10-06 01:03:41 +01:00
parent d944f99e1f
commit 7b795ac332
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/templates/asset_list.html
View File

@@ -8,7 +8,7 @@
<h1 class="text-center">Asset List</h1> <h1 class="text-center">Asset List</h1>
</div> </div>
<form id="asset-search-form"> <form id="asset-search-form" method="get">
{% csrf_token %} {% csrf_token %}
<div class="input-group"> <div class="input-group">
<input type="query" name="query" placeholder="Search by Asset ID/Description" class="form-control" value="{{search_name}}"> <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"> <select name="cat" class="form-control">
<option value="">None</option> <option value="">None</option>
{% for name in categories %} {% for name in categories %}
{% if name == category_select %} {% if name.name == category_select %}
<option selected> <option selected>
{% else %} {% else %}
<option> <option>
@@ -35,7 +35,7 @@
<select name="status" class="form-control"> <select name="status" class="form-control">
<option value="">None</option> <option value="">None</option>
{% for name in statuses %} {% for name in statuses %}
{% if name == status_select %} {% if name.name == status_select %}
<option selected> <option selected>
{% else %} {% else %}
<option> <option>

4
assets/views.py
View File

@@ -36,7 +36,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
status = self.request.GET.get('status', "") status = self.request.GET.get('status', "")
if cat != "": if cat != "":
queryset = queryset.filter(category__name__exact=cat) queryset = queryset.filter(category__name__exact=cat)
elif status != "": if status != "":
queryset = queryset.filter(status__name__exact=status) queryset = queryset.filter(status__name__exact=status)
return queryset return queryset
@@ -49,7 +49,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
context["category_select"] = self.request.GET.get('cat', "") context["category_select"] = self.request.GET.get('cat', "")
context["statuses"] = models.AssetStatus.objects.all() context["statuses"] = models.AssetStatus.objects.all()
context["status_select"] = self.request.GET.get('stats', "") context["status_select"] = self.request.GET.get('status', "")
return context; return context;
class AssetSearch(AssetList): class AssetSearch(AssetList):