Skip to content

Commit f105f33

Browse files
committed
paginating events and attendances
1 parent d0d3d75 commit f105f33

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

app/controllers/member/conclave/attendances_controller.rb

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
class Member::Conclave::AttendancesController < Member::BaseController
22

33
def index
4-
@attendances = current_user.attendances
4+
@order = params[:order] || 'created_at'
5+
@page = params[:page] || '1'
6+
@asc = params[:asc] || 'desc'
7+
@attendances = current_user.attendances.paginate :per_page => 10,
8+
:page => @page,
9+
:order => @order + " " + @asc
510
end
611

712
def create

app/controllers/member/conclave/events_controller.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ def index
66
@order = params[:order] || 'title'
77
@page = params[:page] || '1'
88
@asc = params[:asc] || 'asc'
9-
@events = current_user.events :per_page => 10,
10-
:page => @page,
11-
:order => @order + " " + @asc
9+
@events = current_user.events.paginate :per_page => 10,
10+
:page => @page,
11+
:order => @order + " " + @asc
1212
end
1313

1414
def show

0 commit comments

Comments
 (0)