gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2740 from differentreality/survey_question_validation

Browse source 
Fix JS error when saving survey_question
This commit is contained in:
Henne Vogelsang 2021-03-07 14:43:11 +01:00 • committed by GitHub
commit 5e70690619
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/survey_question.rb
View file

@ -11,8 +11,8 @@ class SurveyQuestion < ActiveRecord::Base
validates :title, presence: true validates :title, presence: true
validates :possible_answers, :max_choices, :min_choices, presence: true, if: :choice? validates :possible_answers, :max_choices, :min_choices, presence: true, if: :choice?
validates :min_choices, numericality: { greater_than_or_equal_to: 1 }, allow_blank: true validates :min_choices, numericality: { greater_than_or_equal_to: 1 }, allow_blank: true, if: :choice?
validates :max_choices, numericality: { greater_than_or_equal_to: 1 }, allow_blank: true validates :max_choices, numericality: { greater_than_or_equal_to: 1 }, allow_blank: true, if: :choice?
validate :max_choices_greater_than_min validate :max_choices_greater_than_min

2
app/views/admin/survey_questions/_form.html.haml
View file

@ -15,7 +15,7 @@
.row .row
.col-md-12 .col-md-12
= f.input :title = f.input :title, input_html: { autofocus: true }
= f.input :mandatory = f.input :mandatory
.survey-possible-answers{ class: @survey_question.choice? ? '' : 'hidden' } .survey-possible-answers{ class: @survey_question.choice? ? '' : 'hidden' }
= f.input :possible_answers, hint: 'Comma separated', input_html: { rows: 3 } = f.input :possible_answers, hint: 'Comma separated', input_html: { rows: 3 }