Merge ed087352e2 into 7a95c43a57

config/routes.rb

@@ -21,6 +21,9 @@ Osem::Application.routes.draw do
     resources :users
     resources :comments, only: [:index]
     resources :conference do
+      resources :surveys do
+        resources :survey_questions
+      end
       resource :contact, except: [:index, :new, :create, :show, :destroy]
       resource :schedule, only: [:show, :update]
       get 'commercials/render_commercial' => 'commercials#render_commercial'
@@ -93,6 +96,10 @@ Osem::Application.routes.draw do
   end
 
   resources :conference, only: [:index, :show] do
+    resources :surveys, only: [:show] do
+      resource :survey_submission
+      post :reply
+    end
     resource :program, only: [] do
       resources :proposal, except: :destroy do
         get 'commercials/render_commercial' => 'commercials#render_commercial'