From 7e29bb43c829d11375ec99e0028fb593f48c279e Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Sat, 25 Oct 2014 23:36:29 +0200
Subject: [PATCH] =?UTF-8?q?Les=20=C3=A9v=C3=A9nements=20renvoy=C3=A9s=20pa?=
=?UTF-8?q?s=20maps.json=20peuvent=20maintenant=20=C3=AAtre=20filtr=C3=A9s?=
=?UTF-8?q?=20par=20les=20param=C3=A8tres=20`region`,=20`locality`=20et=20?=
=?UTF-8?q?`tag`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/maps_controller.rb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/app/controllers/maps_controller.rb b/app/controllers/maps_controller.rb
index 077350ab2..474bfac1e 100644
--- a/app/controllers/maps_controller.rb
+++ b/app/controllers/maps_controller.rb
@@ -5,7 +5,13 @@ class MapsController < ApplicationController
def index
respond_to do |format|
format.html
- format.json { render json: Event.moderated.future.geo }
+ format.json do
+ @events = Event.moderated.future.geo
+ @events = @events.region params[:region] if params[:region]
+ @events = @events.locality params[:locality] if params[:locality]
+ @events = @events.tag params[:tag] if params[:tag]
+ render json: @events
+ end
end
end
end
--
GitLab