From 3e07d959691a8059153f4db31c4953a88dce0e2d Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Wed, 15 May 2019 18:53:27 -0400
Subject: [PATCH] Refactor Pagination macro

---
 templates/audit_log/audit_log.html   |  2 +-
 templates/components/pagination.html | 29 ++++++++++++++--------------
 templates/portfolios/admin.html      |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/templates/audit_log/audit_log.html b/templates/audit_log/audit_log.html
index 6c2cf5c4..803d70ad 100644
--- a/templates/audit_log/audit_log.html
+++ b/templates/audit_log/audit_log.html
@@ -4,6 +4,6 @@
 {% block content %}
   <div v-cloak>
     {% include "fragments/audit_events_log.html" %}
-    {{ Pagination(audit_events, 'atst.activity_history')}}
+    {{ Pagination(audit_events, url_for('atst.activity_history'))}}
   </div>
 {% endblock %}
diff --git a/templates/components/pagination.html b/templates/components/pagination.html
index 8b086588..e85904ca 100644
--- a/templates/components/pagination.html
+++ b/templates/components/pagination.html
@@ -1,4 +1,4 @@
-{% macro Page(pagination, route, i, label=None, disabled=False, portfolio_id=None) -%}
+{% macro Page(pagination, url, i, label=None, disabled=False) -%}
   {% set label = label or i %}
 
   {% set button_class = "page usa-button " %}
@@ -11,44 +11,45 @@
     {% set button_class = button_class + "usa-button-secondary" %}
   {% endif %}
 
-    <a id="{{ label }}" type="button" class="{{ button_class }}" href="{{ url_for(route, portfolio_id=portfolio_id, page=i, perPage=pagination.per_page) if not disabled else 'null' }}">{{ label }}</a>
+    <a id="{{ label }}" type="button" class="{{ button_class }}" href="{{ url if not disabled else 'null' }}">{{ label }}</a>
 {%- endmacro %}
 
-{% macro Pagination(pagination, route, portfolio_id=None) -%}
+{% macro Pagination(pagination, url) -%}
+
   <div class="pagination">
 
     {% if pagination.page == 1 %}
-      {{ Page(pagination, route, 1, label="first", disabled=True, portfolio_id=portfolio_id) }}
-      {{ Page(pagination, route, pagination.page - 1, label="prev", disabled=True, portfolio_id=portfolio_id) }}
+      {{ Page(pagination, url, 1, label="first", disabled=True) }}
+      {{ Page(pagination, url, pagination.page - 1, label="prev", disabled=True) }}
     {% else %}
-      {{ Page(pagination, route, 1, label="first", portfolio_id=portfolio_id) }}
-      {{ Page(pagination, route, pagination.page - 1, label="prev", portfolio_id=portfolio_id) }}
+      {{ Page(pagination, url, 1, label="first") }}
+      {{ Page(pagination, url, pagination.page - 1, label="prev") }}
     {% endif %}
 
     {% if pagination.page == 1 %}
       {% set max_page = [pagination.pages, 5] | min %}
       {% for i in range(1, max_page + 1) %}
-        {{ Page(pagination, route, i, portfolio_id=portfolio_id) }}
+        {{ Page(pagination, url, i) }}
       {% endfor %}
     {% elif pagination.page == pagination.pages %}
       {% for i in range(pagination.pages - 4, pagination.pages + 1) %}
         {% if i > 0 %}
-          {{ Page(pagination, route, i, portfolio_id=portfolio_id) }}
+          {{ Page(pagination, url, i) }}
         {% endif %}
       {% endfor %}
     {% else %}
       {% set window = pagination | pageWindow %}
       {% for i in range(window.0, window.1 + 1) %}
-        {{ Page(pagination, route, i, portfolio_id=portfolio_id) }}
+        {{ Page(pagination, url, i) }}
       {% endfor %}
     {% endif %}
 
     {% if pagination.page == pagination.pages %}
-      {{ Page(pagination, route, pagination.page + 1, label="next", disabled=True, portfolio_id=portfolio_id) }}
-      {{ Page(pagination, route, pagination.pages, label="last", disabled=True, portfolio_id=portfolio_id) }}
+      {{ Page(pagination, url, pagination.page + 1, label="next", disabled=True) }}
+      {{ Page(pagination, url, pagination.pages, label="last", disabled=True) }}
     {% else %}
-      {{ Page(pagination, route, pagination.page + 1, label="next", portfolio_id=portfolio_id) }}
-      {{ Page(pagination, route, pagination.pages, label="last", portfolio_id=portfolio_id) }}
+      {{ Page(pagination, url, pagination.page + 1, label="next") }}
+      {{ Page(pagination, url, pagination.pages, label="last") }}
     {% endif %}
 
   </div>
diff --git a/templates/portfolios/admin.html b/templates/portfolios/admin.html
index 6ba37cb0..40010a53 100644
--- a/templates/portfolios/admin.html
+++ b/templates/portfolios/admin.html
@@ -52,7 +52,7 @@
 
     {% if user_can(permissions.VIEW_PORTFOLIO_ACTIVITY_LOG) %}
       {% include "fragments/audit_events_log.html" %}
-      {{ Pagination(audit_events, 'portfolios.admin', portfolio_id=portfolio.id) }}
+      {{ Pagination(audit_events, url_for('portfolios.admin', portfolio_id=portfolio.id)) }}
     {% endif %}
   </div>
 {% endblock %}