From 9709692a087e5a4a18f161a8fb57689efdc2a83a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 28 Aug 2015 09:55:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E6=AF=8F?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E6=98=BE=E7=A4=BA=E4=B8=AA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 2 +-
 app/helpers/users_helper.rb         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f8eeb289a..7c2b51470 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -176,7 +176,7 @@ class UsersController < ApplicationController
         render_404
         return
     end
-    @message_alls = paginateHelper @message_alls,15
+    @message_alls = paginateHelper @message_alls,25
     respond_to do |format|
       format.html{render :layout=>'new_base_user'}
     end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index ebfd9f881..2f74b1f7d 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -425,6 +425,7 @@ module UsersHelper
     return str.html_safe
   end
 
+  # journal.details 记录每个动作的新旧值
   def get_issue_des_update(journal)
     arr = details_to_strings(journal.details,true)
     arr << journal.notes