diff --git a/app/controllers/admin/asks_controller.rb b/app/controllers/admin/asks_controller.rb index aac71ed..eb031dd 100644 --- a/app/controllers/admin/asks_controller.rb +++ b/app/controllers/admin/asks_controller.rb @@ -277,9 +277,7 @@ class Admin::AsksController < OrbitAdminController ask_setting = AskSetting.create() if ask_setting.nil? end if temp_params['custom_values'].nil? - temp_params['custom_values'] = @ask_question.custom_values - else - temp_params['custom_values'] = @ask_question.custom_values.merge(temp_params['custom_values']) + temp_params['custom_values'] = {} end 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 @@ -293,6 +291,7 @@ class Admin::AsksController < OrbitAdminController temp_params['custom_values'][k] = @ask_question.custom_values[k] rescue nil end end + temp_params['custom_values'] = @ask_question.custom_values.merge(temp_params['custom_values']) flag = @ask_question.save if flag all_to_save.each do |to_save|