Fix bug preventing 'disabled' style from rendering

This commit is contained in:
richard-dds 2018-11-14 17:09:13 -05:00
parent ee86ea2b1a
commit 5c7907efe5

View File

@ -11,20 +11,10 @@
{% set button_class = button_class + "usa-button-secondary" %} {% set button_class = button_class + "usa-button-secondary" %}
{% endif %} {% endif %}
<a class="{{ button_class }}" href="{{ url_for(route, page=i, perPage=pagination.per_page) }}">{{ label }}</a> <a id="{{ label }}" type="button" class="{{ button_class }}" href="{{ url_for(route, page=i, perPage=pagination.per_page) if not disabled else 'null' }}">{{ label }}</a>
{%- endmacro %} {%- endmacro %}
{% macro Pagination(pagination, route) -%} {% macro Pagination(pagination, route) -%}
{% set first %}
{{ Page(pagination, route, 1, label="first") }}
{{ Page(pagination, route, pagination.page - 1, label="prev") }}
{% endset %}
{% set last %}
{{ Page(pagination, route, pagination.page + 1, label="next") }}
{{ Page(pagination, route, pagination.pages, label="last") }}
{% endset %}
<div class="pagination"> <div class="pagination">
{% if pagination.page == 1 %} {% if pagination.page == 1 %}
@ -46,8 +36,8 @@
{{ Page(pagination, route, pagination.pages, label="last", disabled=True) }} {{ Page(pagination, route, pagination.pages, label="last", disabled=True) }}
{% else %} {% else %}
{% set window = pagination | pageWindow %} {% set window = pagination | pageWindow %}
{{ Page(pagination, route, 1, label="first", disabled=True) }} {{ Page(pagination, route, 1, label="first") }}
{{ Page(pagination, route, pagination.page - 1, label="prev", disabled=True) }} {{ Page(pagination, route, pagination.page - 1, label="prev") }}
{% for i in range(window.0, window.1 + 1) %} {% for i in range(window.0, window.1 + 1) %}
{{ Page(pagination, route, i) }} {{ Page(pagination, route, i) }}
{% endfor %} {% endfor %}