Merge branch 'master' into aperez-edit-poll-question-answers

app/controllers/admin/poll/questions/answers_controller.rb

@@ -1,6 +1,6 @@
 class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController
   before_action :load_question, except: [:show, :edit, :update]
-  before_action :load_answer, only: [:show, :edit, :update]
+  before_action :load_answer, only: [:show, :edit, :update, :documents]
 
   load_and_authorize_resource :question, class: "::Poll::Question"
 
@@ -30,21 +30,24 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController
       redirect_to admin_answer_path(@answer),
                notice: t("flash.actions.save_changes.notice")
     else
-      render :edit
+      redirect_to :back
     end
   end
 
+  def documents
+    @documents = @answer.documents
+
+    render 'admin/poll/questions/answers/documents'
+  end
+
   private
 
     def answer_params
-      params.require(:poll_question_answer).permit(:title, :description, :question_id)
-    end
-
-    def load_question
-      @question = ::Poll::Question.find(params[:question_id])
+      params.require(:poll_question_answer).permit(:title, :description, :question_id, documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy])
     end
 
     def load_answer
-      @answer = ::Poll::Question::Answer.find(params[:id])
+      @answer = ::Poll::Question::Answer.find(params[:id] || params[:answer_id])
     end
+
 end