Add given_order to related poll question answers forms
Since given order is no longer being generated automatically we need to add it to related forms and to strong parameters methods
This commit is contained in:
@@ -50,7 +50,8 @@ class Admin::Poll::Questions::AnswersController < Admin::Poll::BaseController
|
|||||||
|
|
||||||
def answer_params
|
def answer_params
|
||||||
documents_attributes = [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]
|
documents_attributes = [:id, :title, :attachment, :cached_attachment, :user_id, :_destroy]
|
||||||
attributes = [:title, :description, :question_id, documents_attributes: documents_attributes]
|
attributes = [:title, :description, :given_order, :question_id,
|
||||||
|
documents_attributes: documents_attributes]
|
||||||
params.require(:poll_question_answer).permit(*attributes, *translation_params(Poll::Question::Answer))
|
params.require(:poll_question_answer).permit(*attributes, *translation_params(Poll::Question::Answer))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
class Dashboard::PollsController < Dashboard::BaseController
|
class Dashboard::PollsController < Dashboard::BaseController
|
||||||
helper_method :poll
|
helper_method :poll
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@@ -62,7 +62,8 @@ class Dashboard::PollsController < Dashboard::BaseController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def question_answers_attributes
|
def question_answers_attributes
|
||||||
[:id, :_destroy, :title, :description, :question_id, documents_attributes: documents_attributes]
|
[:id, :_destroy, :title, :description, :given_order, :question_id,
|
||||||
|
documents_attributes: documents_attributes]
|
||||||
end
|
end
|
||||||
|
|
||||||
def documents_attributes
|
def documents_attributes
|
||||||
|
|||||||
@@ -4,6 +4,9 @@
|
|||||||
|
|
||||||
<%= render 'shared/errors', resource: @answer %>
|
<%= render 'shared/errors', resource: @answer %>
|
||||||
|
|
||||||
|
<%= f.hidden_field :given_order,
|
||||||
|
value: @answer.persisted? ? @answer.given_order : @answer.class.last_position(@answer.question_id || @question.id) + 1 %>
|
||||||
|
|
||||||
<%= f.hidden_field :question_id, value: @answer.question_id || @question.id %>
|
<%= f.hidden_field :question_id, value: @answer.question_id || @question.id %>
|
||||||
|
|
||||||
<%= f.translatable_text_field :title %>
|
<%= f.translatable_text_field :title %>
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<div class="small-12 medium-6 column">
|
<div class="small-12 medium-6 column">
|
||||||
<div class="answer-fields">
|
<div class="answer-fields">
|
||||||
|
<%= f.hidden_field :given_order %>
|
||||||
<div class="row expanded">
|
<div class="row expanded">
|
||||||
<div class="small-12 medium-9 column">
|
<div class="small-12 medium-9 column">
|
||||||
<%= f.text_field :title %>
|
<%= f.text_field :title %>
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ feature 'Answers' do
|
|||||||
expect(page).to have_content(new_title)
|
expect(page).to have_content(new_title)
|
||||||
expect(page).not_to have_content(old_title)
|
expect(page).not_to have_content(old_title)
|
||||||
|
|
||||||
expect(page.body.index(new_title)).to be < page.body.index(answer2.title)
|
expect(answer2.title).to appear_before(new_title)
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user