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

FEAT #386: Asset search searches serial number.

Browse Source 
Pending addition of advanced search.
This commit is contained in:
FreneticScribbler
2020-01-02 18:34:38 +00:00
parent 81c32baa8e
commit 406a9dad36
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/filters.py
View File

@@ -6,4 +6,4 @@ from assets import models
class AssetFilter(django_filters.FilterSet): class AssetFilter(django_filters.FilterSet):
class Meta: class Meta:
model = models.Asset model = models.Asset
fields = ['asset_id', 'description', 'category', 'status'] fields = ['asset_id', 'description', 'serial_number', 'category', 'status']

4
assets/templates/asset_list.html
View File

@@ -11,8 +11,8 @@
<form id="asset-search-form" method="get" class="form-inline pull-right"> <form id="asset-search-form" method="get" class="form-inline pull-right">
<div class="input-group pull-right" style="width: auto;"> <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"%} {% 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:</label> <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> <span class="input-group-btn"><button type="submit" class="btn btn-default">Search</button></span>
</div> </div>
<br> <br>

2
assets/views.py
View File

@@ -39,7 +39,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
queryset = self.model.objects.all() queryset = self.model.objects.all()
elif len(query_string) >= 3: elif len(query_string) >= 3:
queryset = self.model.objects.filter( 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: else:
queryset = self.model.objects.filter(Q(asset_id__exact=query_string)) queryset = self.model.objects.filter(Q(asset_id__exact=query_string))