From 91bca6c26113791c83de1ad7d4c28cd2a24aff81 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Sat, 18 Jul 2015 13:47:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/users_helper.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 1926be0e8..db041c0ba 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -447,7 +447,9 @@ module UsersHelper
       when "Issue"
         return activity.act.subject
       when "Journal"
-        return details_to_strings(activity.act.details,true).to_s
+        arr = details_to_strings(activity.act.details,true)
+        arr << activity.act.notes
+        return arr.to_s
       when "JournalsForMessage"
         return activity.act.notes
       when "Message"