Skip to content
Extraits de code Groupes Projets
Valider 795deb56 rédigé par echarp's avatar echarp
Parcourir les fichiers

Events are by default ordered by starting date, except for rss

parent 177855e4
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -24,7 +24,6 @@ class EventsController < ApplicationController
# GET /events/new
def new; end
# POST /events/preview
def preview_create
@event.valid?
render action: :new
......@@ -84,8 +83,8 @@ class EventsController < ApplicationController
def set_events
# The 3000 limit is purely arbitrary...
@events = apply_scopes Event.moderated.limit(3000)
@events = @events.limit(20) if params[:format] == 'rss'
@events = apply_scopes Event.includes(:tags).moderated.limit(3000).order('events.start_time asc')
@events = @events.limit(20).order('events.id desc') if params[:format] == 'rss'
end
def new_event
......
......@@ -40,7 +40,6 @@ class Event < ApplicationRecord
after_destroy EventCallbacks
default_scope { includes(:base_tags).order('events.id desc') }
scope :moderated, ->(*) { where moderated: true }
scope :unmoderated, ->(*) { where moderated: false }
scope :past, -> { where 'start_time <= ?', Time.zone.now }
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter