gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 514a88e0be into a4ef10cf1b

Browse source
This commit is contained in:
Anitha Palanisamy 2017-01-31 13:57:04 +00:00 • committed by GitHub
commit f1e37df5a0
21 changed files with 264 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/routes.rb
View file

@ -26,6 +26,9 @@ Osem::Application.routes.draw do
end
resources :comments, only: [:index]
resources :conferences do
member do
get :conference_info
end
resource :contact, except: [:index, :new, :create, :show, :destroy]
resources :schedules, only: [:index, :create, :show, :update, :destroy]
resources :event_schedules, only: [:create, :update, :destroy]
@ -103,7 +106,7 @@ Osem::Application.routes.draw do
get '/revision_history/:id/revert_attribute' => 'versions#revert_attribute', as: 'revision_history_revert_attribute'
end
resources :conferences, only: [:index, :show] do
resources :conferences, only: [:index, :show ] do
resource :program, only: [] do
resources :proposals, except: :destroy do
get 'commercials/render_commercial' => 'commercials#render_commercial'