From 440ba27fa4e4d4bfe30d1e4bba249cc8dd4a682c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 8 Apr 2016 18:52:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/blog_comment.rb         | 1 +
 app/models/homework_common.rb      | 1 +
 app/models/journal.rb              | 5 +++--
 app/models/journals_for_message.rb | 1 +
 app/models/mailer.rb               | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb
index 945a3c5c2..7e368064b 100644
--- a/app/models/blog_comment.rb
+++ b/app/models/blog_comment.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
 class BlogComment < ActiveRecord::Base
   # attr_accessible :title, :body
   require 'net/http'
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 670a8341b..bdf61dbd0 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
 #老师布置的作业表
 #homework_type: 0:普通作业;1:匿评作业;2:编程作业
 class HomeworkCommon < ActiveRecord::Base
diff --git a/app/models/journal.rb b/app/models/journal.rb
index b62cf8d97..24b3db172 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #
@@ -252,7 +253,7 @@ class Journal < ActiveRecord::Base
                     color:"#173177"
                 },
                 keyword1:{
-                    value:self.author.try(:realname),
+                    value:self.user.try(:realname),
                     color:"#173177"
                 },
                 keyword2:{
@@ -260,7 +261,7 @@ class Journal < ActiveRecord::Base
                     color:"#173177"
                 },
                 keyword3:{
-                    value:self.description.html_safe,
+                    value:self.notes.html_safe,
                     color:"#173177"
                 },
                 remark:{
diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb
index 82820990f..b70176d9e 100644
--- a/app/models/journals_for_message.rb
+++ b/app/models/journals_for_message.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
 # fq
 # 数据库字段中带有m前缀和is_readed是二次开发添加，之前的字段基本复用
 # 注意reply_id 是提到人的id，不是留言id, Base中叫做 at_user
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 93aa21a78..58492be31 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -1,3 +1,4 @@
+#encoding: utf-8
 # Redmine - project management software
 # Copyright (C) 2006-2013  Jean-Philippe Lang
 #