ソースを参照

Fix pagination mixup

Maarten van den Berg 7 年 前
コミット
5a495cc9d6
共有1 個のファイルを変更した2 個の追加1 個の削除を含む
  1. 2 1
      app/controllers/dashboard_controller.rb

+ 2 - 1
app/controllers/dashboard_controller.rb

7
       .joins(:activity)
7
       .joins(:activity)
8
       .where('activities.end >= ? OR (activities.end IS NULL AND activities.start >= ?)', DateTime.now, DateTime.now)
8
       .where('activities.end >= ? OR (activities.end IS NULL AND activities.start >= ?)', DateTime.now, DateTime.now)
9
       .order('activities.start ASC')
9
       .order('activities.start ASC')
10
-      .paginate(page: params[:upage], per_page: 10)
11
     @user_organized = @upcoming
10
     @user_organized = @upcoming
12
       .where(is_organizer: true)
11
       .where(is_organizer: true)
13
       .limit(3)
12
       .limit(3)
13
+    @upcoming = @upcoming
14
+      .paginate(page: params[:upage], per_page: 10)
14
     @need_response = @upcoming
15
     @need_response = @upcoming
15
       .where(attending: nil)
16
       .where(attending: nil)
16
       .paginate(page: params[:nrpage], per_page: 5)
17
       .paginate(page: params[:nrpage], per_page: 5)