From 7b0f6ddd10aa940481cd9a33ac45aee46cbf61ef Mon Sep 17 00:00:00 2001 From: chiu Date: Fri, 21 Aug 2020 19:04:16 +0800 Subject: [PATCH] fix error --- app/controllers/admin/asks_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/asks_controller.rb b/app/controllers/admin/asks_controller.rb index e46b94f..aac71ed 100644 --- a/app/controllers/admin/asks_controller.rb +++ b/app/controllers/admin/asks_controller.rb @@ -277,9 +277,9 @@ class Admin::AsksController < OrbitAdminController ask_setting = AskSetting.create() if ask_setting.nil? end if temp_params['custom_values'].nil? - temp_params['custom_values'] = ask_setting.custom_values + temp_params['custom_values'] = @ask_question.custom_values else - temp_params['custom_values'] = ask_setting.custom_values.merge(temp_params['custom_values']) + temp_params['custom_values'] = @ask_question.custom_values.merge(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