From 852bb940a2d0310d461c0ec6b0d32716d986357a Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 30 Jan 2015 11:31:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=8E=89=E6=97=A5=E5=BF=97?=
=?UTF-8?q?=E4=B8=AD=E6=97=A5=E5=BF=97=E5=88=86=E6=9E=90=E7=9A=84=E8=AF=B7?=
=?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/helpers/system_log_helper.rb | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/app/helpers/system_log_helper.rb b/app/helpers/system_log_helper.rb
index 918d6a608..12e02ca8f 100644
--- a/app/helpers/system_log_helper.rb
+++ b/app/helpers/system_log_helper.rb
@@ -25,11 +25,17 @@ module SystemLogHelper
logs = Kaminari.paginate_array(logs).page(page).per(per).collect! { |log| parse(log) }
#将分页后的记录的搜索结果添加样式,样式中的\0是给给r占位置的。
logs.collect! do |log|
- keywords.each { |r| log.gsub!(r, '\0') }
+ keywords.each { |r| log.gsub!(r, '\0') && log = "" if log =~ Regexp.new("SystemLogController",'i') }
log
end
+
else
logs = Kaminari.paginate_array(logs).page(page).per(per).collect! { |log| parse(log) }
+ # 过滤掉日志中日志分析请求
+ logs.collect! do |log|
+ log = "" if log =~ Regexp.new("SystemLogController",'i')
+ log
+ end
end
logs
end