From 3e2e5f59724d6c03cc291c6ae41bc6f26cb26c0f Mon Sep 17 00:00:00 2001 From: siteswapjuggler Date: Sun, 24 Sep 2017 18:17:40 +0200 Subject: [PATCH] cancelled event management on front page Cancelled event (nb_total_places = -1) are not prompted anymore on the homepage >> no need to push them to the final user. They are still display in the event module for continuity --- app/controllers/api/events_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/api/events_controller.rb b/app/controllers/api/events_controller.rb index 7ce75a376..3b63a1bc8 100644 --- a/app/controllers/api/events_controller.rb +++ b/app/controllers/api/events_controller.rb @@ -18,8 +18,10 @@ class API::EventsController < API::ApiController def upcoming limit = params[:limit] @events = Event.includes(:event_image, :event_files, :availability, :category) + .where('events.nb_total_places != -1 OR events.nb_total_places IS NULL') .where('availabilities.start_at >= ?', Time.now) - .order('availabilities.start_at ASC').references(:availabilities).limit(limit) + .order('availabilities.start_at ASC').references(:availabilities) + .limit(limit) end def show