From 2e2d790d355a78b4c7e626b773c31cf220c768a0 Mon Sep 17 00:00:00 2001 From: echarp Date: Sat, 7 Nov 2015 15:11:53 +0100 Subject: [PATCH] Json listing of events --- app/controllers/events_controller.rb | 1 + app/views/events/index.json.jbuilder | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb index 62b423c2..3e499c0f 100644 --- a/app/controllers/events_controller.rb +++ b/app/controllers/events_controller.rb @@ -13,6 +13,7 @@ class EventsController < ApplicationController def index respond_to do |format| format.html { render layout: 'iframe' if params[:iframe] } + format.json { } format.rss { @events = @events.future } format.ics { @events = @events.last_year.includes :region } format.xml { @events = @events.includes :region } diff --git a/app/views/events/index.json.jbuilder b/app/views/events/index.json.jbuilder index ec76ffd3..360ce6ac 100644 --- a/app/views/events/index.json.jbuilder +++ b/app/views/events/index.json.jbuilder @@ -1,6 +1,6 @@ json.array!(@events) do |event| json.extract! event, :id, :title, :description, :start_time, :end_time, - :address, :city, :region_id, :locality, :url, :contact, + :place_name, :address, :city, :region_id, :locality, :url, :contact, :submitter, :moderated, :tags, :secret, :decision_time, :submission_time, :moderator_mail_id, :submitter_mail_id