Site
/
clarion
11
0
Fork 0
Code Issues 4 Pull Requests 1 Packages Projects Releases Wiki Activity

Expose part of the event API again

This commit is contained in:
Petko Bordjukov 2016-08-27 17:11:20 +03:00
parent 3fd09ca53a
commit f8d261f149
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/events_controller.rb
View File

@ -3,7 +3,7 @@ class Api::EventsController < Api::ApplicationController
before_filter :require_current_conference! before_filter :require_current_conference!
def index def index
@events = current_conference.events.includes(:participations) @events = current_conference.events.approved.joins(:proposition).includes(:participations)
end end
def halfnarp_friendly def halfnarp_friendly

6
config/routes.rb
View File

@ -15,12 +15,12 @@ Rails.application.routes.draw do
namespace :api do namespace :api do
resources :conferences, only: [] do resources :conferences, only: [] do
# resources :events, only: :index do resources :events, only: :index do
# collection do # collection do
# get :halfnarp_friendly # get :halfnarp_friendly
# end # end
# end end
# resources :speakers, only: :index resources :speakers, only: :index
resources :tracks, only: :index resources :tracks, only: :index
resources :event_types, only: :index resources :event_types, only: :index
resources :halls, only: :index resources :halls, only: :index