dani/django-ram
1
0
Fork 0
mirror of https://github.com/daniviga/django-ram.git synced 2025-08-04 13:17:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix result count

Browse Source
This commit is contained in:
Daniele Viganò
2022-04-19 21:42:37 +02:00
parent 72f5311d7a
commit dad33189aa
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ram/portal/templates/search.html
View File

@@ -2,7 +2,7 @@
{% block header %} {% block header %}
<h1 class="fw-light">{{ filter | default_if_none:"Search" | title }}: {{ search }}</h1> <h1 class="fw-light">{{ filter | default_if_none:"Search" | title }}: {{ search }}</h1>
<p class="lead text-muted">Results found: {{ rolling_stock | length }}</p> <p class="lead text-muted">Results found: {{ matches }}</p>
{% endblock %} {% endblock %}
{% block pagination %} {% block pagination %}
{% if rolling_stock.has_other_pages %} {% if rolling_stock.has_other_pages %}

13
ram/portal/views.py
View File

@@ -31,8 +31,6 @@ class GetHome(View):
class GetHomeFiltered(View): class GetHomeFiltered(View):
def run_search(self, request, search, _filter, page=1): def run_search(self, request, search, _filter, page=1):
# if not hasattr(RollingStock, _filter):
# raise Http404
site_conf = get_site_conf() site_conf = get_site_conf()
if _filter is None: if _filter is None:
query = reduce( query = reduce(
@@ -62,6 +60,7 @@ class GetHomeFiltered(View):
else: else:
raise Http404 raise Http404
rolling_stock = RollingStock.objects.filter(query) rolling_stock = RollingStock.objects.filter(query)
matches = len(rolling_stock)
paginator = Paginator(rolling_stock, site_conf.items_per_page) paginator = Paginator(rolling_stock, site_conf.items_per_page)
try: try:
@@ -71,10 +70,11 @@ class GetHomeFiltered(View):
except EmptyPage: except EmptyPage:
rolling_stock = paginator.page(paginator.num_pages) rolling_stock = paginator.page(paginator.num_pages)
return rolling_stock return rolling_stock, matches
def get(self, request, search, _filter=None, page=1): def get(self, request, search, _filter=None, page=1):
rolling_stock = self.run_search(request, search, _filter, page) rolling_stock, matches = self.run_search(
request, search, _filter, page)
return render( return render(
request, request,
@@ -82,6 +82,7 @@ class GetHomeFiltered(View):
{ {
"search": search, "search": search,
"filter": _filter, "filter": _filter,
"matches": matches,
"rolling_stock": rolling_stock, "rolling_stock": rolling_stock,
}, },
) )
@@ -90,7 +91,8 @@ class GetHomeFiltered(View):
search = request.POST.get("search") search = request.POST.get("search")
if not search: if not search:
raise Http404 raise Http404
rolling_stock = self.run_search(request, search, _filter, page) rolling_stock, matches = self.run_search(
request, search, _filter, page)
return render( return render(
request, request,
@@ -98,6 +100,7 @@ class GetHomeFiltered(View):
{ {
"search": search, "search": search,
"filter": _filter, "filter": _filter,
"matches": matches,
"rolling_stock": rolling_stock, "rolling_stock": rolling_stock,
}, },
) )