From 9cf30b431a2c4f905ee5160aae4a543129ff8aa2 Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Thu, 12 Nov 2020 14:09:59 -0800 Subject: [PATCH 1/2] specify Spree routes for pagination --- app/views/spree/admin/users/index.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/spree/admin/users/index.html.haml b/app/views/spree/admin/users/index.html.haml index fb60688ce7..c36fa7d7c5 100644 --- a/app/views/spree/admin/users/index.html.haml +++ b/app/views/spree/admin/users/index.html.haml @@ -26,7 +26,9 @@ %td.user_enterprise_limit= user.enterprise_limit %td.actions = link_to_delete user, no_text: true -= paginate @users +- _with_routes Spree::Core::Engine.routes do + = paginate @users + - content_for :sidebar_title do = t(".search") - content_for :sidebar do From 8dfd3f624d591cf1f922873b11da3f5f16dfbff5 Mon Sep 17 00:00:00 2001 From: Andy Brett Date: Thu, 12 Nov 2020 14:24:04 -0800 Subject: [PATCH 2/2] paginate zones using spree routes as well --- app/views/spree/admin/zones/index.html.haml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/spree/admin/zones/index.html.haml b/app/views/spree/admin/zones/index.html.haml index eefd8b9ab7..6a6a9a5e94 100644 --- a/app/views/spree/admin/zones/index.html.haml +++ b/app/views/spree/admin/zones/index.html.haml @@ -7,7 +7,8 @@ %li = button_link_to t("spree.new_zone"), new_object_url, icon: 'icon-plus', id: 'admin_new_zone_link' -= paginate @zones +- _with_routes Spree::Core::Engine.routes do + = paginate @zones - if @zones.empty? .no-objects-found @@ -38,4 +39,5 @@ %td.actions = link_to_edit zone, no_text: true = link_to_delete zone, no_text: true -= paginate @zones +- _with_routes Spree::Core::Engine.routes do + = paginate @zones