From 10277138e1f9bd7c3236dcdd3c64d52303477196 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Morais?=
 <385232+gnclmorais@users.noreply.github.com>
Date: Wed, 21 Jan 2026 21:27:04 +0100
Subject: [PATCH 1/2] Fix 'Past RSVPs' page

Closes #2435
---
 app/controllers/admin/members_controller.rb | 4 ++--
 app/views/admin/members/events.html.haml    | 4 ++--
 spec/features/admin/members_spec.rb         | 7 +++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb
index 16dc202f1..ef6bcb09c 100644
--- a/app/controllers/admin/members_controller.rb
+++ b/app/controllers/admin/members_controller.rb
@@ -15,8 +15,8 @@ def show
   def events
     load_attendance_data(@member)
 
-    past_rsvps = @member.past_rsvps
-    @pagy, @past_rsvps = pagy(:offset, items: past_rsvps)
+    @member = MemberPresenter.new(@member)
+    @pagy, @past_rsvps = pagy(:offset, @member.past_rsvps)
   end
 
   def update_subscriptions
diff --git a/app/views/admin/members/events.html.haml b/app/views/admin/members/events.html.haml
index d8c66643a..4a3086b15 100644
--- a/app/views/admin/members/events.html.haml
+++ b/app/views/admin/members/events.html.haml
@@ -15,9 +15,9 @@
 
       - if @past_rsvps.any?
         %h3 Past RSVPs
-        = render partial: 'shared/pagination', locals: { pagy: @pagy, model: 'events' }
+        = render partial: 'shared/pagination', locals: { pagy: @pagy, model: 'event' }
 
         - @past_rsvps.each do |invitation|
           = render EventPresenter.decorate(invitation.event), invitation: invitation
 
-        = render partial: 'shared/pagination', locals: { pagy: @pagy, model: 'events' }
+        = render partial: 'shared/pagination', locals: { pagy: @pagy, model: 'event' }
diff --git a/spec/features/admin/members_spec.rb b/spec/features/admin/members_spec.rb
index 983b316e1..51c0b6cc6 100644
--- a/spec/features/admin/members_spec.rb
+++ b/spec/features/admin/members_spec.rb
@@ -27,6 +27,13 @@
       end
     end
 
+    it 'can view paginated list of past RSVPs' do
+      click_on 'View all RSVPS'
+
+      expect(page).to have_content('Past RSVPs')
+      expect(page).to have_content('Displaying 1 event')
+    end
+
     it 'can add a note about a member' do
       click_on 'Add note'
       fill_in 'member_note_note', with: 'Bananas and custard'

From 386552d5d86e4d1d122d566e074204206d11c034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Morais?=
 <385232+gnclmorais@users.noreply.github.com>
Date: Thu, 22 Jan 2026 09:06:33 +0100
Subject: [PATCH 2/2] Fix pluralization on pagination

---
 app/views/shared/_pagination.html.haml | 2 +-
 spec/features/admin/sponsor_spec.rb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/shared/_pagination.html.haml b/app/views/shared/_pagination.html.haml
index 2c937447d..78a7a983f 100644
--- a/app/views/shared/_pagination.html.haml
+++ b/app/views/shared/_pagination.html.haml
@@ -1,6 +1,6 @@
 .row.align-items-center.justify-content-between
   .col-auto
     %p.mb-3
-      != pagy.info_tag(item_name: model.pluralize(pagy.count))
+      != pagy.info_tag(item_name: model)
   .col-auto
     != pagy.series_nav(:bootstrap) if pagy.pages > 1
diff --git a/spec/features/admin/sponsor_spec.rb b/spec/features/admin/sponsor_spec.rb
index 8d23d8553..957a82e15 100644
--- a/spec/features/admin/sponsor_spec.rb
+++ b/spec/features/admin/sponsor_spec.rb
@@ -58,7 +58,7 @@
       click_on 'Filter'
 
       expect(page.all(:css, 'tbody tr', count: 0))
-      expect(page).to have_content('No sponsors found')
+      expect(page).to have_content('No sponsor found')
     end
 
     scenario 'can clear filtering form' do