Merge branch 'master' into 'master'

Fix bug.

See merge request spen/seminar!42
This commit is contained in:
chiu 2022-06-08 13:20:47 +00:00
commit d88fe7f400
1 changed files with 14 additions and 13 deletions

View File

@ -533,8 +533,9 @@ class SeminarsController < ApplicationController
def update def update
@con = SeminarSignupContribute.find(params[:seminar_signup_contribute][:id]) @con = SeminarSignupContribute.find(params[:seminar_signup_contribute][:id])
update_params = seminar_signup_contribute_params.merge('seminar_submission_values'=>params['seminar_submission_values']) update_params = seminar_signup_contribute_params.merge('seminar_submission_values'=>params['seminar_submission_values'])
flag = true
update_params.permit! update_params.permit!
unless update_params['seminar_submission_values'].nil?
flag = true
if update_params['seminar_submission_values']['0']['value'].class==String if update_params['seminar_submission_values']['0']['value'].class==String
value = update_params['seminar_submission_values']['0']['value'] value = update_params['seminar_submission_values']['0']['value']
if !value.to_s.blank? if !value.to_s.blank?
@ -547,10 +548,10 @@ class SeminarsController < ApplicationController
end end
end end
end end
if flag if flag
update_params['seminar_submission_values']['0']['value']['en'] = ' ' update_params['seminar_submission_values']['0']['value']['en'] = ' '
end end
end
@con.update_attributes(update_params) @con.update_attributes(update_params)
if @con.save if @con.save
signup = SeminarSignup.where(id:update_params['seminar_signup_id']).first signup = SeminarSignup.where(id:update_params['seminar_signup_id']).first