Commit d44f0a26 authored by Ilham Maulana's avatar Ilham Maulana 💻

fix: search query

parent f522953a
...@@ -67,9 +67,9 @@ class CategoryListView(generic.ListView): ...@@ -67,9 +67,9 @@ class CategoryListView(generic.ListView):
order = self.request.GET.get("o") order = self.request.GET.get("o")
if keyword: if keyword:
queryset = queryset.filter( queryset = queryset.filter(Q(name__icontains=keyword)).order_by(
Q(name__icontains=keyword) | Q(description__icontains=keyword) "-created_at"
).order_by("-created_at") )
if order: if order:
if order == "new": if order == "new":
......
...@@ -22,8 +22,7 @@ class OverduedLoanView(ListView): ...@@ -22,8 +22,7 @@ class OverduedLoanView(ListView):
if keyword: if keyword:
queryset = queryset.filter( queryset = queryset.filter(
Q(book__title__icontains=keyword) Q(book__title__icontains=keyword)
| Q(member__name__icontains=keyword) | Q(member__user__username__icontains=keyword)
| Q(librarian__name__icontains=keyword)
).order_by("-created_at") ).order_by("-created_at")
if order: if order:
...@@ -62,8 +61,7 @@ class UpcomingLoanView(ListView): ...@@ -62,8 +61,7 @@ class UpcomingLoanView(ListView):
if keyword: if keyword:
queryset = queryset.filter( queryset = queryset.filter(
Q(book__title__icontains=keyword) Q(book__title__icontains=keyword)
| Q(member__name__icontains=keyword) | Q(member__user__username__icontains=keyword)
| Q(librarian__name__icontains=keyword)
).order_by("-created_at") ).order_by("-created_at")
if order: if order:
......
...@@ -18,7 +18,8 @@ class BookLoanListView(generic.ListView): ...@@ -18,7 +18,8 @@ class BookLoanListView(generic.ListView):
if keyword: if keyword:
queryset = queryset.filter( queryset = queryset.filter(
Q(book__title__icontains=keyword) | Q(member__name__icontains=keyword) Q(book__title__icontains=keyword)
| Q(member__user__username__icontains=keyword)
).order_by("-created_at") ).order_by("-created_at")
if order: if order:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment