Move pagination links to partial

Tidies up the views a little by moving the code to generate pagination controls to a reusable shared partial. This also adds some extra control to hide the pagination links when only one page is displayed, in line with GDS guidelines.
ministryofjustice · Dec 20, 2024 · 7aa38fa · 7aa38fa
1 parent f825c2b
commit 7aa38fa
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 19 deletions.
diff --git a/app/views/case_workers/admin/allocations/new.html.haml b/app/views/case_workers/admin/allocations/new.html.haml
@@ -13,5 +13,4 @@
   .js-re-allocation-page
     = render partial: 're_allocation'
 
-  %nav.pagination.app-pagintion--inline
-    = pagy_nav(@pagy).html_safe
+  = render partial: 'shared/pagination'
diff --git a/app/views/case_workers/claims/archived.html.haml b/app/views/case_workers/claims/archived.html.haml
@@ -5,5 +5,4 @@
 = render partial: 'search_form', locals: { archived: true }
 = render partial: 'claims_list', locals: { claims: @claims }
 
-%nav.pagination.app-pagintion--inline
-  = pagy_nav(@pagy).html_safe
+= render partial: 'shared/pagination'
diff --git a/app/views/case_workers/claims/index.html.haml b/app/views/case_workers/claims/index.html.haml
@@ -5,5 +5,4 @@
 = render partial: 'search_form', locals: { archived: false }
 = render partial: 'claims_list', locals: { claims: @claims }
 
-%nav.pagination.app-pagintion--inline
-  = pagy_nav(@pagy).html_safe
+= render partial: 'shared/pagination'
diff --git a/app/views/external_users/claims/archived.html.haml b/app/views/external_users/claims/archived.html.haml
@@ -9,6 +9,4 @@
 
 #details
   = render partial: 'main_claims_list', locals: { claims: @claims }
-
-%nav.pagination.app-pagintion--inline
-  = pagy_nav(@pagy).html_safe
+  = render partial: 'shared/pagination'
diff --git a/app/views/external_users/claims/authorised.html.haml b/app/views/external_users/claims/authorised.html.haml
@@ -10,6 +10,4 @@
 
 #details#listanchor
   = render partial: 'main_claims_list', locals: { claims: @claims }
-
-%nav.pagination.app-pagintion--inline
-  = pagy_nav(@pagy).html_safe
+  = render partial: 'shared/pagination'
diff --git a/app/views/external_users/claims/index.html.haml b/app/views/external_users/claims/index.html.haml
@@ -20,5 +20,4 @@
 
 = render partial: 'main_claims_list', locals: { claims: @claims }
 
-%nav.pagination.app-pagintion--inline
-  = pagy_nav(@pagy).html_safe
+= render partial: 'shared/pagination'
diff --git a/app/views/external_users/claims/outstanding.html.haml b/app/views/external_users/claims/outstanding.html.haml
@@ -10,6 +10,4 @@
 
 #details#listanchor
   = render partial: 'main_claims_list', locals: { claims: @claims }
-
-%nav.pagination.app-pagintion--inline
-  = pagy_nav(@pagy).html_safe
+  = render partial: 'shared/pagination'
diff --git a/app/views/shared/_pagination.html.haml b/app/views/shared/_pagination.html.haml
@@ -0,0 +1,2 @@
+%nav.pagination.app-pagintion--inline
+  = pagy_nav(@pagy).html_safe if @pagy.pages > 1
diff --git a/app/views/users/index.html.haml b/app/views/users/index.html.haml
@@ -29,6 +29,5 @@
             = govuk_table_td('data-label': t('.created')) do
               = user.created_at
 
-%nav.pagination.app-pagintion--inline
-  = pagy_nav(@pagy).html_safe
+= render partial: 'shared/pagination'
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		%nav.pagination.app-pagintion--inline
		= pagy_nav(@pagy).html_safe if @pagy.pages > 1