Refactoring Conference/Event media to new media object

close #420
This commit is contained in:
Chrisbr 2014-08-05 18:23:42 +02:00
parent 850beb72e1
commit 2a731e8350
31 changed files with 491 additions and 57 deletions

View file

@ -8,6 +8,13 @@ defaults: &defaults
# errbit configuration, get your own instance: https://github.com/errbit/errbit
#errbit_key: See config/secrets.yml
#errbit_host: errbit.exmaple.com
# These are the currently supported commercial types for conference and events
commercial_types: { youtube: 'YouTube',
slideshare: 'SlideShare',
flickr: 'Flickr',
vimeo: 'Vimeo',
speakerdeck: 'Speakerdeck',
instagram: 'Instagram' }
development:
<<: *defaults

View file

@ -10,6 +10,7 @@ Osem::Application.routes.draw do
resources :conference do
resource :contact, except: [:index, :new, :create]
resource :schedule, only: [:show, :update]
resources :commercials, except: [:show]
get '/stats' => 'stats#index'
get '/venue' => 'venue#show', as: 'venue_info'
patch '/venue' => 'venue#update', as: 'venue_update'
@ -80,6 +81,7 @@ Osem::Application.routes.draw do
resources :conference, only: [:show] do
resources :proposal do
resources :commercials, except: [:show, :index]
resources :event_attachment, controller: "event_attachments"
member do
patch '/confirm' => 'proposal#confirm'