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

First pass at filters

Browse Source 
They're currently exclusive with each other and search, which ain't quite right!

Also stopped search from searching comments.
This commit is contained in:
FreneticScribbler
2019-10-02 22:49:54 +01:00
parent 8599a2ae5b
commit 5bfa737f6b
4 changed files with 77 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
assets/views.py
View File

@@ -20,18 +20,27 @@ class AssetList(LoginRequiredMixin, generic.ListView):
ordering = ['-pk']
def get_queryset(self):
q = self.request.GET.get('q', "")
if len(q) >= 3:
return self.model.objects.filter(Q(asset_id__exact=q) | Q(description__icontains=q) | Q(comments__icontains=q))
elif q != "":
return self.model.objects.filter(Q(asset_id__exact=q))
#TODO Feedback to user when search fails
query = self.request.GET.get('query', "")
if len(query) >= 3:
return self.model.objects.filter(Q(asset_id__exact=query) | Q(description__icontains=query))
elif query != "":
return self.model.objects.filter(Q(asset_id__exact=query))
else:
return self.model.objects.all()
cat = self.request.GET.get('cat', "")
status = self.request.GET.get('status', "")
if cat != "None":
return self.model.objects.filter(category__name__exact=cat)
elif status != "None":
return self.model.objects.filter(status__name__exact=status)
else:
return self.model.objects.all()
def get_context_data(self, **kwargs):
q = self.request.GET.get('q', "")
context = super(AssetList, self).get_context_data(**kwargs)
context["searchName"] = q
context["search_name"] = self.request.GET.get('query', "")
context["categories"] = models.AssetCategory.objects.all()
context["statuses"] = models.AssetStatus.objects.all()
return context;
class AssetDetail(LoginRequiredMixin, generic.DetailView):