diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 0511e2128..50b0c075b 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -122,7 +122,7 @@ class Mailer < ActionMailer::Base @course_journal_messages,@user_journal_messages,@forums,@memos,@attachments,@bids].any? {|o| !o.empty? } - binding.pry + binding.pry if Rails.env.development? #有内容才发,没有不发 mail :to => user.mail,:subject => subject if has_content end diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 1735bd899..d5c4212cd 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -90,7 +90,7 @@ :class => 'wmail_info', :style => "color:#5a5a5a; float:left; margin-right:5px; display:block;color:#1b55a7;overflow:hidden; white-space: nowrap; text-overflow:ellipsis;" %> - <%= format_time(homework.created_on) %> + <%= format_time(homework.created_at) %> <% end %> <% end %>