Merge branch 'master' into 1786-poll_results

2017-10-23 13:43:58 +02:00
parent 96f588566a 8ca4d0fb7f
commit 5a9ee4642e
25 changed files with 341 additions and 153 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -275,10 +275,12 @@ Rails.application.routes.draw do

    scope module: :poll do
      resources :polls do
+        get :booth_assignments, on: :collection
        patch :add_question, on: :member

        resources :booth_assignments, only: [:index, :show, :create, :destroy] do
          get :search_booths, on: :collection
+          get :manage, on: :collection
        end

        resources :officer_assignments, only: [:index, :create, :destroy] do