diff --git a/app/controllers/admin/asks_controller.rb b/app/controllers/admin/asks_controller.rb index 34ea5b9..a70f846 100644 --- a/app/controllers/admin/asks_controller.rb +++ b/app/controllers/admin/asks_controller.rb @@ -364,7 +364,6 @@ class Admin::AsksController < OrbitAdminController def update locale = I18n.locale temp_params = params.require(:ask_question).permit! - all_to_save = [] ask_setting = AskCategorySetting.where(category_id: params['ask_question']['category_id']).first if ask_setting.nil? diff --git a/app/controllers/asks_controller.rb b/app/controllers/asks_controller.rb index 72c818f..9b0c81c 100644 --- a/app/controllers/asks_controller.rb +++ b/app/controllers/asks_controller.rb @@ -492,7 +492,7 @@ class AsksController < ApplicationController acknowledgement = AskAcknowledgement.where(:category_id => params['category']).first rescue nil content = acknowledgement.nil? ? t('ask.thank_text') : acknowledgement.content { - "content" => content #[I18n.locale] + "content" => content[I18n.locale] } end diff --git a/app/helpers/admin/asks_helper.rb b/app/helpers/admin/asks_helper.rb index 1cd1fa8..d5c2e7e 100644 --- a/app/helpers/admin/asks_helper.rb +++ b/app/helpers/admin/asks_helper.rb @@ -307,7 +307,7 @@ module Admin::AsksHelper end end when 'text_area' - readonly ? value : text_area_tag(field_name,value,{:required => v['required']=='true',:placeholder=> v['prompt_word'][I18n.locale],:title=> v['prompt_word'][I18n.locale],:class=>'ckeditor'}) + readonly ? value.to_s.gsub("\n", "
").gsub("\r", "").html_safe : text_area_tag(field_name,value,{:required => v['required']=='true',:placeholder=> v['prompt_word'][I18n.locale],:title=> v['prompt_word'][I18n.locale],:class=>'ckeditor'}) when 'radio_button' options_hash = Hash(v['options']) if lock diff --git a/app/views/asks/email.html.erb b/app/views/asks/email.html.erb index 2a3b2a2..31778b6 100644 --- a/app/views/asks/email.html.erb +++ b/app/views/asks/email.html.erb @@ -95,7 +95,7 @@ end %> <%= trans %> - <%= val %> + <%= val.to_s.gsub("\n", "
").gsub("\r", "").html_safe %> <% end %> <% else %> diff --git a/app/views/asks/email_verification.html.erb b/app/views/asks/email_verification.html.erb index 0d4d01a..f682203 100644 --- a/app/views/asks/email_verification.html.erb +++ b/app/views/asks/email_verification.html.erb @@ -5,7 +5,7 @@

- <%= @data['validation_email_content'].to_s.gsub(/[(\n)(\r)]/, "\n" => "
", "\r" => "" ).html_safe %> + <%= @data['validation_email_content'].to_s.gsub("\n", "
").gsub("\r", "").html_safe %>


<% if @data['referer_link'] %>