From c8f2430004cbb5ee3fda381041cf61ab6f42f4bd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 19 Sep 2015 11:16:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=B6=88=E6=81=AF=E6=AF=8F?=
 =?UTF-8?q?=E9=A1=B5=E6=98=BE=E7=A4=BA10=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 2 +-
 app/views/users/user_system_messages.html.erb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b6ac28258..d3921d44a 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -198,7 +198,7 @@ class UsersController < ApplicationController
   # 系统消息
   def user_system_messages
     @sytem_messages = SystemMessage.order("created_at desc").all
-    @sytem_messages = paginateHelper @sytem_messages,25
+    @sytem_messages = paginateHelper @sytem_messages, 10
     respond_to do |format|
       format.html{render :layout=>'new_base_user'}
     end
diff --git a/app/views/users/user_system_messages.html.erb b/app/views/users/user_system_messages.html.erb
index cf0130547..3b8bd9fb6 100644
--- a/app/views/users/user_system_messages.html.erb
+++ b/app/views/users/user_system_messages.html.erb
@@ -39,8 +39,8 @@
         </div>
         <div class="homepagePostDes">
           <div class="homepagePostTo break_word">
-            <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>
+            <span class="fl"><span style="color:#0781b4;">Trustie平台 </span>发布了系统消息：</span>
+            <span style="color:#0781b4; max-width:470px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;vertical-align: top;"><%= system_message.subject.nil? ? "系统消息" : system_message.subject %></span>
           </div>
           <div class="cl"></div>
           <p class="homepagePostIntro break_word upload_img">