Merge pull request #2515 from codebar/fix-events-not-showing

Override default scope for Workshop

Author: olleolleolle

app/models/concerns/listable.rb

@@ -4,8 +4,8 @@ module Listable
   extend ActiveSupport::Concern
 
   included do
-    scope :today_and_upcoming, -> { where('date_and_time >= ?', Time.zone.today).order(date_and_time: :asc) }
-    scope :upcoming, -> { where('date_and_time >= ?', Time.zone.now).order(date_and_time: :asc) }
+    scope :today_and_upcoming, -> { where('date_and_time >= ?', Time.zone.today).reorder(date_and_time: :asc) }
+    scope :upcoming, -> { where('date_and_time >= ?', Time.zone.now).reorder(date_and_time: :asc) }
     scope :past, -> { where('date_and_time < ?', Time.zone.now).order(:date_and_time) }
     scope :recent, lambda {
       where('date_and_time < ?', Time.zone.now)