From 660ace3cddc755b12f25cce95f3aad42a64c868a Mon Sep 17 00:00:00 2001 From: Olivier Lacan Date: Sat, 12 Aug 2017 00:06:48 +0200 Subject: [PATCH] Fix pagination on given/received compliments Didn't realize these used the index view too. --- app/controllers/compliments_controller.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/compliments_controller.rb b/app/controllers/compliments_controller.rb index 76f74a2..4e1736b 100644 --- a/app/controllers/compliments_controller.rb +++ b/app/controllers/compliments_controller.rb @@ -13,20 +13,26 @@ def index end def given - @compliments = current_user.compliments_given + @compliments = current_user.compliments_given. + paginate(page: params[:page], per_page: 30) + render :index end def received - @compliments = current_user.compliments_received respond_to do |format| format.html do + @compliments = current_user.compliments_received. + paginate(page: params[:page], per_page: 30) + render :index end format.csv do + @compliments = current_user.compliments_received headers['Content-Disposition'] = "attachment; filename=\"compliments.csv\"" headers['Content-Type'] ||= 'text/csv' - @headers = ['From', 'To', "Compliment", "When"] + @headers = ["From", "To", "Compliment", "When"] + render :index end end