diff --git a/app/controllers/admin/asks_controller.rb b/app/controllers/admin/asks_controller.rb index 2d2f3ed..b5005a0 100644 --- a/app/controllers/admin/asks_controller.rb +++ b/app/controllers/admin/asks_controller.rb @@ -91,18 +91,20 @@ class Admin::AsksController < OrbitAdminController end def destroy + locale = I18n.locale @ask_question.destroy - redirect_to "/admin/asks" + redirect_to "/#{locale}/admin/asks" end def update + locale = I18n.locale ask_question_param = params.require(:ask_question).permit! @ask_question.update_attributes(ask_question_param) if @ask_question.send_email? build_email(@ask_question) end - redirect_to admin_asks_path, notice: t('ask.reply_success') + redirect_to "/#{locale}/admin/asks", notice: t('ask.reply_success') end def build_email(email_er) @@ -114,7 +116,11 @@ class Admin::AsksController < OrbitAdminController @group_mail = email_er.mail @mail_sentdate = DateTime.now + site = Site.first + mail_from = site['title'][site['default_locale']] + email_er.email.update_attributes( + :mail_from=> mail_from, :create_user=>current_user, :mail_sentdate=>@mail_sentdate, :module_app=>@module_app, diff --git a/app/controllers/asks_controller.rb b/app/controllers/asks_controller.rb index 6b4878e..7046b17 100644 --- a/app/controllers/asks_controller.rb +++ b/app/controllers/asks_controller.rb @@ -191,7 +191,7 @@ class AsksController < ActionController::Base @mail_sentdate = DateTime.now site = Site.first - mail_from = site['site_settings']['service_email'] + mail_from = site['title'][site['default_locale']] email_er.email.update_attributes( :mail_from=> mail_from,