Merge branch 'master' into poll-shifts-search-officers

2017-09-11 00:07:12 +02:00
parent 3b4e80a34d 4ba232a165
commit dd02c83fa3
17 changed files with 117 additions and 54 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -287,9 +287,11 @@ Rails.application.routes.draw do
      end

      resources :booths do
+        get :available, on: :collection 
+
        resources :shifts do
          get :search_officers, on: :collection
-        end
+        end        
      end

      resources :questions