Merge remote-tracking branch 'origin/szzh' into szzh

2015-12-18 11:20:07 +08:00 · 2015-12-18 11:20:07 +08:00 · e867358bc1
parent 06734d86ca 8c967e6559
commit e867358bc1
1 changed files with 1 additions and 1 deletions
--- a/app/models/at_message.rb
+++ b/app/models/at_message.rb
@ -47,7 +47,7 @@ class AtMessage < ActiveRecord::Base
          "回复帖子: "
        end +  at_message.subject
      when 'JournalsForMessage'
-        "作业留言: " + at_message.jour.description
+        "作业: #{at_message.jour.name} 中留言"
      else
        logger.error "error type: #{at_message_type}"
    end