From 0232826a6e2b1017596f626a567fc69c6cb3d2b2 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Fri, 30 Jan 2015 12:04:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E4=BF=AE=E6=94=B9=E5=BC=95?=
 =?UTF-8?q?=E5=85=A5bug:=E5=85=B3=E9=94=AE=E5=AD=97=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E4=BB=BB=E4=BD=95=E4=B8=9C=E8=A5=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/system_log_helper.rb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/helpers/system_log_helper.rb b/app/helpers/system_log_helper.rb
index 5412339de..2ca5baaed 100644
--- a/app/helpers/system_log_helper.rb
+++ b/app/helpers/system_log_helper.rb
@@ -19,15 +19,12 @@ module SystemLogHelper
           keywords = keywords.strip.split(/\s+/).collect! { |w| Regexp.new(w, 'i') }
           # 一条记录应该匹配每个关键字 log =~ r  是对log记录进行判断是否符合r的正则表达式
           logs = logs.find_all do |log|
-            keywords.all? { |r| log =~ r }
+            keywords.all? { |r| log =~ r && !(log =~ Regexp.new("SystemLogController#",'i')) }
           end
           #用Kaminari分页
           logs = Kaminari.paginate_array(logs).page(page).per(per).collect! { |log| parse(log) }
           #将分页后的记录的搜索结果添加样式，样式中的\0是给给r占位置的。
           logs.collect! do |log|
-            if log =~ Regexp.new("SystemLogController",'i')
-              log = ""
-            end
             keywords.each { |r| log.gsub!(r, '<span class="search_results">\0</span>')  }
             log
           end