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

Reduce elided_page_range

Browse Source
This commit is contained in:
Daniele Viganò
2022-07-20 21:51:18 +02:00
parent 63379c9673
commit 4fb9d1903f
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,7 +166,7 @@
<tbody> <tbody>
<tr> <tr>
<th width="35%" scope="row">Class</th> <th width="35%" scope="row">Class</th>
<td>{{ rolling_stock.rolling_class }}</td> <td>{{ rolling_stock.rolling_class.identifier }}</td>
</tr> </tr>
<tr> <tr>
<th scope="row">Type</th> <th scope="row">Type</th>

24
ram/portal/views.py
View File

@@ -38,7 +38,9 @@ class GetHome(View):
paginator = Paginator(rolling_stock, site_conf.items_per_page) paginator = Paginator(rolling_stock, site_conf.items_per_page)
rolling_stock = paginator.get_page(page) rolling_stock = paginator.get_page(page)
page_range = paginator.get_elided_page_range(rolling_stock.number) page_range = paginator.get_elided_page_range(
rolling_stock.number, on_each_side=2, on_ends=1
)
return render( return render(
request, request,
@@ -86,7 +88,9 @@ class GetHomeFiltered(View):
paginator = Paginator(rolling_stock, site_conf.items_per_page) paginator = Paginator(rolling_stock, site_conf.items_per_page)
rolling_stock = paginator.get_page(page) rolling_stock = paginator.get_page(page)
page_range = paginator.get_elided_page_range(rolling_stock.number) page_range = paginator.get_elided_page_range(
rolling_stock.number, on_each_side=2, on_ends=1
)
return rolling_stock, matches, page_range return rolling_stock, matches, page_range
@@ -166,7 +170,9 @@ class Consists(View):
paginator = Paginator(consist, site_conf.items_per_page) paginator = Paginator(consist, site_conf.items_per_page)
consist = paginator.get_page(page) consist = paginator.get_page(page)
page_range = paginator.get_elided_page_range(consist.number) page_range = paginator.get_elided_page_range(
consist.number, on_each_side=2, on_ends=1
)
return render( return render(
request, request,
@@ -186,7 +192,9 @@ class GetConsist(View):
paginator = Paginator(rolling_stock, site_conf.items_per_page) paginator = Paginator(rolling_stock, site_conf.items_per_page)
rolling_stock = paginator.get_page(page) rolling_stock = paginator.get_page(page)
page_range = paginator.get_elided_page_range(rolling_stock.number) page_range = paginator.get_elided_page_range(
rolling_stock.number, on_each_side=2, on_ends=1
)
return render( return render(
request, request,
@@ -206,7 +214,9 @@ class Companies(View):
paginator = Paginator(company, site_conf.items_per_page) paginator = Paginator(company, site_conf.items_per_page)
company = paginator.get_page(page) company = paginator.get_page(page)
page_range = paginator.get_elided_page_range(company.number) page_range = paginator.get_elided_page_range(
company.number, on_each_side=2, on_ends=1
)
return render( return render(
request, request,
@@ -222,7 +232,9 @@ class Scales(View):
paginator = Paginator(scale, site_conf.items_per_page) paginator = Paginator(scale, site_conf.items_per_page)
scale = paginator.get_page(page) scale = paginator.get_page(page)
page_range = paginator.get_elided_page_range(scale.number) page_range = paginator.get_elided_page_range(
scale.number, company.number, on_each_side=2, on_ends=1
)
return render( return render(
request, request,