Merge branch 'master' into aperez-admin-question-videos

app/controllers/admin/poll/questions/answers/images_controller.rb

@@ -0,0 +1,32 @@
+class Admin::Poll::Questions::Answers::ImagesController < Admin::Poll::BaseController
+  before_action :load_answer
+
+  def index
+  end
+
+  def new
+  	@answer = ::Poll::Question::Answer.find(params[:answer_id])
+  end
+
+  def create
+    @answer = ::Poll::Question::Answer.find(params[:answer_id])
+    @answer.attributes = images_params
+
+    if @answer.save
+      redirect_to admin_answer_images_path(@answer),
+               notice: "Image uploaded successfully"
+    else
+      render :new
+    end
+  end
+
+  private
+
+    def images_params
+      params.permit(images_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy])
+    end
+
+    def load_answer
+      @answer = ::Poll::Question::Answer.find(params[:answer_id])
+    end
+end

app/controllers/admin/poll/shifts_controller.rb

@@ -1,7 +1,6 @@
 class Admin::Poll::ShiftsController < Admin::Poll::BaseController
 
   before_action :load_booth
-  before_action :load_polls
   before_action :load_officer
 
   def new
@@ -39,10 +38,6 @@ class Admin::Poll::ShiftsController < Admin::Poll::BaseController
       @booth = ::Poll::Booth.find(params[:booth_id])
     end
 
-    def load_polls
-      @polls = ::Poll.current_or_incoming
-    end
-
     def load_shifts
       @shifts = @booth.shifts
     end

app/controllers/officing/voters_controller.rb

@@ -3,7 +3,8 @@ class Officing::VotersController < Officing::BaseController
 
   def new
     @user = User.find(params[:id])
-    @polls = Poll.answerable_by(@user)
+    booths = current_user.poll_officer.shifts.current.vote_collection.pluck(:booth_id).uniq
+    @polls = Poll.answerable_by(@user).where(id: Poll::BoothAssignment.where(booth: booths).pluck(:poll_id).uniq)
   end
 
   def create