ソースを参照

Tweak Dashboard upcoming-query

...to keep an activity until it's ended, if available.
Maarten van den Berg 7 年 前
コミット
0d2ec67f8f
共有1 個のファイルを変更した1 個の追加1 個の削除を含む
  1. 1 1
      app/controllers/dashboard_controller.rb

+ 1 - 1
app/controllers/dashboard_controller.rb

5
     @upcoming = current_person
5
     @upcoming = current_person
6
       .participants
6
       .participants
7
       .joins(:activity)
7
       .joins(:activity)
8
-      .where('activities.start >= ?', 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)
10
       .paginate(page: params[:upage], per_page: 10)
11
     @user_organized = @upcoming
11
     @user_organized = @upcoming