From efdfa67c64cbac8126dd04e2bf52ebe735e9eaac Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 30 Mar 2015 21:32:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=8A=A5homework=20created=5Fon=20to?=
 =?UTF-8?q?=20created=5Fat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                               | 2 +-
 app/views/mailer/send_for_user_activities.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;"
             %>
-            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(homework.created_on) %></span>
+            <span class="wmail_date" style="color:#6e6e6e; float:right;display:block; margin-left:10px;"><%= format_time(homework.created_at) %></span>
           </li>
       <% end %>
       <% end %>