Moves geozones from questions to polls in admin controllers

app/controllers/admin/poll/polls_controller.rb

@@ -1,6 +1,8 @@
 class Admin::Poll::PollsController < Admin::BaseController
   load_and_authorize_resource
+
   before_action :load_search, only: [:search_booths, :search_questions, :search_officers]
+  before_action :load_geozones, only: [:new, :create, :edit, :update]
 
   def index
   end
@@ -78,9 +80,12 @@ class Admin::Poll::PollsController < Admin::BaseController
   end
 
   private
+    def load_geozones
+      @geozones = Geozone.all.order(:name)
+    end
 
     def poll_params
-      params.require(:poll).permit(:name, :starts_at, :ends_at)
+      params.require(:poll).permit(:name, :starts_at, :ends_at, :geozone_restricted, geozone_ids: [])
     end
 
     def search_params

app/controllers/admin/poll/questions_controller.rb

@@ -2,8 +2,6 @@ class Admin::Poll::QuestionsController < Admin::BaseController
   load_and_authorize_resource :poll
   load_and_authorize_resource :question, class: 'Poll::Question'
 
-  before_action :load_geozones, only: [:new, :create, :edit, :update]
-
   def index
     @polls = Poll.all
     @search = search_params[:search]
@@ -55,12 +53,8 @@ class Admin::Poll::QuestionsController < Admin::BaseController
 
   private
 
-    def load_geozones
-      @geozones = Geozone.all.order(:name)
-    end
-
     def question_params
-      params.require(:poll_question).permit(:title, :question, :summary, :description, :proposal_id, :valid_answers, :poll_id, :geozone_ids => [])
+      params.require(:poll_question).permit(:title, :question, :summary, :description, :proposal_id, :valid_answers)
     end
 
     def search_params