jiang
/
ask
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error

This commit is contained in:
chiu 2020-08-21 19:06:13 +08:00
parent 7b0f6ddd10
commit f2a0d1ca71
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/admin/asks_controller.rb
View File

@ -277,9 +277,7 @@ class Admin::AsksController < OrbitAdminController
ask_setting = AskSetting.create() if ask_setting.nil? ask_setting = AskSetting.create() if ask_setting.nil?
end end
if temp_params['custom_values'].nil? if temp_params['custom_values'].nil?
temp_params['custom_values'] = @ask_question.custom_values temp_params['custom_values'] = {}
else
temp_params['custom_values'] = @ask_question.custom_values.merge(temp_params['custom_values'])
end end
ask_setting.custom_fields.select{|k,v| v['type']=='file' || v['type']=='image'}.each do |k,v| ask_setting.custom_fields.select{|k,v| v['type']=='file' || v['type']=='image'}.each do |k,v|
file = temp_params['custom_values'][k] rescue nil file = temp_params['custom_values'][k] rescue nil
@ -293,6 +291,7 @@ class Admin::AsksController < OrbitAdminController
temp_params['custom_values'][k] = @ask_question.custom_values[k] rescue nil temp_params['custom_values'][k] = @ask_question.custom_values[k] rescue nil
end end
end end
temp_params['custom_values'] = @ask_question.custom_values.merge(temp_params['custom_values'])
flag = @ask_question.save flag = @ask_question.save
if flag if flag
all_to_save.each do |to_save| all_to_save.each do |to_save|