Skip to content

Commit

Permalink
Fix pagination URL parameter bug
Browse files Browse the repository at this point in the history
  • Loading branch information
jrauha committed Jan 16, 2024
1 parent 6c1462e commit 9ecf418
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions npcgen/templates/characters/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -105,67 +105,67 @@ <h1 class="title">Gallery</h1>
{% if pagination.page > 1 %}
<li>
<a class="pagination-link"
href="{{ url_for('characters.characters', tab=pagination.tab, search=search, sort=sort, page=pagination.page-1) }}">Previous</a>
href="{{ url_for('characters.characters', tab=tab, search=search, sort=sort, page=pagination.page-1) }}">Previous</a>
</li>
{% endif %}
{% if pagination.total_pages <= 5 %}
{% for p in range(1, pagination.total_pages+1) %}
<li>
<a class="pagination-link {% if p == pagination.page %}is-current{% endif %}"
href="{{ url_for('characters.characters', tab=pagination.tab, search=search, sort=sort, page=p) }}">{{ p }}</a>
href="{{ url_for('characters.characters', tab=tab, search=search, sort=sort, page=p) }}">{{ p }}</a>
</li>
{% endfor %}
{% else %}
{% if pagination.page <= 3 %}
{% for p in range(1, 4) %}
<li>
<a class="pagination-link {% if p == pagination.page %}is-current{% endif %}"
href="{{ url_for('characters.characters', tab=pagination.tab, search=search, sort=sort, page=p) }}">{{ p }}</a>
href="{{ url_for('characters.characters', tab=tab, search=search, sort=sort, page=p) }}">{{ p }}</a>
</li>
{% endfor %}
<li>
<span class="pagination-ellipsis">&hellip;</span>
</li>
<li>
<a class="pagination-link"
href="{{ url_for('characters.characters', tab=pagination.tab, search=search, sort=sort, page=pagination.total_pages) }}">{{
href="{{ url_for('characters.characters', tab=tab, search=search, sort=sort, page=pagination.total_pages) }}">{{
pagination.total_pages
}}</a>
</li>
{% elif pagination.page >= pagination.total_pages - 2 %}
<li>
<a class="pagination-link"
href="{{ url_for('characters.characters', tab=pagination.tab, search=search, sort=sort, page=1) }}">1</a>
href="{{ url_for('characters.characters', tab=tab, search=search, sort=sort, page=1) }}">1</a>
</li>
<li>
<span class="pagination-ellipsis">&hellip;</span>
</li>
{% for p in range(pagination.total_pages-2, pagination.total_pages+1) %}
<li>
<a class="pagination-link {% if p == pagination.page %}is-current{% endif %}"
href="{{ url_for('characters.characters', tab=pagination.tab, search=search, sort=sort, page=p) }}">{{ p }}</a>
href="{{ url_for('characters.characters', tab=tab, search=search, sort=sort, page=p) }}">{{ p }}</a>
</li>
{% endfor %}
{% else %}
<li>
<a class="pagination-link"
href="{{ url_for('characters.characters', tab=pagination.tab, search=search, sort=sort, page=1) }}">1</a>
href="{{ url_for('characters.characters', tab=tab, search=search, sort=sort, page=1) }}">1</a>
</li>
<li>
<span class="pagination-ellipsis">&hellip;</span>
</li>
{% for p in range(pagination.page-1, pagination.page+2) %}
<li>
<a class="pagination-link {% if p == pagination.page %}is-current{% endif %}"
href="{{ url_for('characters.characters', tab=pagination.tab, search=search, sort=sort, page=p) }}">{{ p }}</a>
href="{{ url_for('characters.characters', tab=tab, search=search, sort=sort, page=p) }}">{{ p }}</a>
</li>
{% endfor %}
<li>
<span class="pagination-ellipsis">&hellip;</span>
</li>
<li>
<a class="pagination-link"
href="{{ url_for('characters.characters', tab=pagination.tab, search=search, sort=sort, page=pagination.total_pages) }}">{{
href="{{ url_for('characters.characters', tab=tab, search=search, sort=sort, page=pagination.total_pages) }}">{{
pagination.total_pages
}}</a>
</li>
Expand All @@ -174,7 +174,7 @@ <h1 class="title">Gallery</h1>
{% if pagination.page < pagination.total_pages %}
<li>
<a class="pagination-link"
href="{{ url_for('characters.characters', tab=pagination.tab, search=search, sort=sort, page=pagination.page+1) }}">Next</a>
href="{{ url_for('characters.characters', tab=tab, search=search, sort=sort, page=pagination.page+1) }}">Next</a>
</li>
{% endif %}
</ul>
Expand Down

0 comments on commit 9ecf418

Please sign in to comment.