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

Fix filtered pagination

Browse Source
This commit is contained in:
Daniele Viganò
2022-07-18 22:48:04 +02:00
parent 503a214a4d
commit ad33731913
5 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,7 @@
<td>{{ rolling_stock.sku }}</td> <td>{{ rolling_stock.sku }}</td>
</tr> </tr>
<tr> <tr>
<th scope="row">ERA</th> <th scope="row">Era</th>
<td>{{ rolling_stock.era }}</td> <td>{{ rolling_stock.era }}</td>
</tr> </tr>
<tr> <tr>

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

@@ -10,7 +10,7 @@
<ul class="pagination justify-content-center mt-4"> <ul class="pagination justify-content-center mt-4">
{% if rolling_stock.has_previous %} {% if rolling_stock.has_previous %}
<li class="page-item"> <li class="page-item">
<a class="page-link" href="{% url 'search_pagination' search=search page=rolling_stock.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a> <a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=rolling_stock.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
</li> </li>
{% else %} {% else %}
<li class="page-item disabled"> <li class="page-item disabled">
@@ -26,13 +26,13 @@
{% if i == rolling_stock.paginator.ELLIPSIS %} {% if i == rolling_stock.paginator.ELLIPSIS %}
<li class="page-item"><span class="page-link">{{ i }}</span></li> <li class="page-item"><span class="page-link">{{ i }}</span></li>
{% else %} {% else %}
<li class="page-item"><a class="page-link" href="{% url 'search_pagination' search=search page=i %}#rolling-stock">{{ i }}</a></li> <li class="page-item"><a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=i %}#rolling-stock">{{ i }}</a></li>
{% endif %} {% endif %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if rolling_stock.has_next %} {% if rolling_stock.has_next %}
<li class="page-item"> <li class="page-item">
<a class="page-link" href="{% url 'search_pagination' search=search page=rolling_stock.next_page_number %}#rolling-stock" tabindex="-1">Next</a> <a class="page-link" href="{% url 'filtered_pagination' _filter=filter search=search page=rolling_stock.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
</li> </li>
{% else %} {% else %}
<li class="page-item disabled"> <li class="page-item disabled">

6
ram/portal/urls.py
View File

@@ -18,12 +18,6 @@ urlpatterns = [
GetHomeFiltered.as_view(http_method_names=["post"]), GetHomeFiltered.as_view(http_method_names=["post"]),
name="search", name="search",
), ),
path("search/<str:search>", GetHomeFiltered.as_view(), name="search"),
path(
"search/<str:search>/<int:page>",
GetHomeFiltered.as_view(),
name="search_pagination",
),
path("consists", Consists.as_view(), name="consists"), path("consists", Consists.as_view(), name="consists"),
path( path(
"consists/<int:page>", Consists.as_view(), name="consists_pagination" "consists/<int:page>", Consists.as_view(), name="consists_pagination"

6
ram/portal/views.py
View File

@@ -50,7 +50,7 @@ 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):
site_conf = get_site_conf() site_conf = get_site_conf()
if _filter is None: if _filter == "search":
query = reduce( query = reduce(
operator.or_, operator.or_,
( (
@@ -90,7 +90,7 @@ class GetHomeFiltered(View):
return rolling_stock, matches, page_range return rolling_stock, matches, page_range
def get(self, request, search, _filter=None, page=1): def get(self, request, search, _filter="search", page=1):
rolling_stock, matches, page_range = self.run_search( rolling_stock, matches, page_range = self.run_search(
request, search, _filter, page request, search, _filter, page
) )
@@ -107,7 +107,7 @@ class GetHomeFiltered(View):
}, },
) )
def post(self, request, _filter=None, page=1): def post(self, request, _filter="search", page=1):
search = request.POST.get("search") search = request.POST.get("search")
if not search: if not search:
raise Http404 raise Http404

2
ram/ram/__init__.py
View File

@@ -1,4 +1,4 @@
from ram.utils import git_suffix from ram.utils import git_suffix
__version__ = "0.0.7" __version__ = "0.0.8"
__version__ += git_suffix(__file__) __version__ += git_suffix(__file__)