From 9911dc0658973bbec251bb39efd2c82860ac4cf3 Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 17 Aug 2014 20:47:35 +0200 Subject: [PATCH] =?UTF-8?q?Correction=20rapide=20sur=20un=20soucis=20d'acc?= =?UTF-8?q?=C3=A8s=20aux=20evt=20futurs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/events_controller.rb | 2 +- app/models/event.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index fea32f49..d4289550 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -12,7 +12,7 @@ class EventsController < ApplicationController respond_to do |format| format.html format.rss do - @events = @events.includes(:related_city).future params[:daylimit] + @events = @events.includes(:related_city).future_in params[:daylimit] end format.ics { @events = @events.last_year.order :id } format.xml { @events = @events.includes(:related_region).order :id } diff --git a/app/models/event.rb b/app/models/event.rb index 23ee1abc..1cbd1255 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -23,9 +23,9 @@ class Event < ActiveRecord::Base where('end_time < ?', DateTime.now).order start_time: :desc end) scope :future, (lambda do - where('end_time >= ?', DateTime.now).order start_time: :asc + where('? <= end_time', DateTime.now).order start_time: :asc end) - scope :future, (lambda do |days| + scope :future_in, (lambda do |days| days ||= '30' where('? <= start_time and end_time <= ?', DateTime.now, days.to_i.days.from_now)