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

fix error

This commit is contained in:
chiu 2020-05-13 17:34:42 +08:00
parent 173a3ed90c
commit 917e0bd084
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,12 +120,12 @@ class Admin::AsksController < OrbitAdminController
mail_from = site['title'][site['default_locale']] mail_from = site['title'][site['default_locale']]
email_er.email.update_attributes( email_er.email.update_attributes(
:mail_from=> mail_from, :mail_lang=> site['default_locale'],
:create_user=>current_user, :create_user=>current_user,
:mail_sentdate=>@mail_sentdate, :mail_sentdate=>@mail_sentdate,
:module_app=>@module_app, :module_app=>@module_app,
:mail_to=>@group_mail, :mail_to=>@group_mail,
:mail_subject=>" #{t('ask.reply')}：", :mail_subject=>mail_from+" #{t('ask.reply')}：",
:template=>'admin/asks/email', :template=>'admin/asks/email',
:template_data=>{ :template_data=>{
"reply" => email_er.reply "reply" => email_er.reply

4
app/controllers/asks_controller.rb
View File

@ -194,12 +194,12 @@ class AsksController < ActionController::Base
mail_from = site['title'][site['default_locale']] mail_from = site['title'][site['default_locale']]
email_er.email.update_attributes( email_er.email.update_attributes(
:mail_from=> mail_from, :mail_lang=> site['default_locale'],
:create_user=>(current_user rescue nil), :create_user=>(current_user rescue nil),
:mail_sentdate=>@mail_sentdate, :mail_sentdate=>@mail_sentdate,
:module_app=>@module_app, :module_app=>@module_app,
:mail_to=>@group_mail, :mail_to=>@group_mail,
:mail_subject=>Site.first.title_translations["zh_tw"]+" #{t('ask.new_question')}：", :mail_subject=>mail_from+" #{t('ask.new_question')}：",
:template=>'asks/email', :template=>'asks/email',
:template_data=>{ :template_data=>{
# "title" => email_er.title, # "title" => email_er.title,