Maarten van den Berg 6 years ago
parent
commit
c59b1860d8
1 changed files with 2 additions and 2 deletions
  1. 2 2
      app/models/group.rb

+ 2 - 2
app/models/group.rb

39
     reference ||= Time.zone.now
39
     reference ||= Time.zone.now
40
     activities
40
     activities
41
       .where('start < ?', reference)
41
       .where('start < ?', reference)
42
-      .where('end > ?', reference)
42
+      .where('activities.end > ?', reference)
43
   end
43
   end
44
 
44
 
45
   # @return [Array<Activity>]
45
   # @return [Array<Activity>]
47
   def previous_activities(reference = nil)
47
   def previous_activities(reference = nil)
48
     reference ||= Time.zone.now
48
     reference ||= Time.zone.now
49
     activities
49
     activities
50
-      .where('end < ?', reference)
50
+      .where('activities.end < ?', reference)
51
       .order(end: :desc)
51
       .order(end: :desc)
52
       .limit(3)
52
       .limit(3)
53
   end
53
   end