From 9c74ff0b346a880ce44439b214b40982437d9f50 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 18 Sep 2015 14:36:47 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=BB=E9=A2=98=EF=BC=9B=202.=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E5=86=92=E5=8F=B7=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87=E5=BD=A2=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb        | 2 +-
 app/views/users/user_system_messages.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 23afdd245..82c9f5d3f 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -54,7 +54,7 @@
               <span style="color: red;float: left">【系统消息】</span><li class="homepageSystenMessageContent fl" id="content_<%= usm.id %>">
               <li class="homepageSystenMessageContent fl">
 
-              <%= link_to usm.content.nil? ? usm.description.html_safe : usm.content.html_safe, user_system_messages_path(User.current),
+              <%= link_to usm.subject.nil? ? (usm.content.nil? ? usm.description.html_safe : usm.content.html_safe) : usm.subject, user_system_messages_path(User.current),
                           :id => "content_link_#{usm.id}",
                           :onmouseover =>"message_titile_show($(this),event);",
                           :onmouseout => "message_titile_hide($(this));"
diff --git a/app/views/users/user_system_messages.html.erb b/app/views/users/user_system_messages.html.erb
index 7bfb37dcd..cf0130547 100644
--- a/app/views/users/user_system_messages.html.erb
+++ b/app/views/users/user_system_messages.html.erb
@@ -39,7 +39,7 @@
         </div>
         <div class="homepagePostDes">
           <div class="homepagePostTo break_word">
-            <span class="fl"> Trustie平台 发布了系统消息:</span>
+            <span class="fl"> Trustie平台 发布了系统消息：</span>
             <span style="color:#0781b4; max-width:470px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;vertical-align: top;"><%= system_message.subject %></span>
           </div>
           <div class="cl"></div>