Merge branch 'master' into question-answer-documents

2017-10-06 15:18:42 +02:00
parent 8dd1d6d947 108d4104e8
commit dd69401477
8 changed files with 2 additions and 47 deletions
--- a/app/controllers/admin/poll/questions_controller.rb
+++ b/app/controllers/admin/poll/questions_controller.rb
@@ -56,8 +56,7 @@ class Admin::Poll::QuestionsController < Admin::Poll::BaseController
  private

    def question_params
-      params.require(:poll_question).permit(:poll_id, :title, :question, :proposal_id, :valid_answers, :video_url,
-                                            documents_attributes: [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy])
+      params.require(:poll_question).permit(:poll_id, :title, :question, :proposal_id, :valid_answers, :video_url)
    end

    def search_params