From 3fc988757c9889d89fb2d3db0e3a558cb1fe3535 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 24 Mar 2016 10:14:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E3=80=81=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E7=AD=89=E5=9C=A8=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=AF=B9=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6'=5F'=E3=80=81?= =?UTF-8?q?=E2=80=98/=E2=80=99=E6=B7=BB=E5=8A=A0=E8=BD=AC=E4=B9=89?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E8=83=BD=E5=A4=9F=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/principal.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/principal.rb b/app/models/principal.rb index dd376f609..c027f020e 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -42,9 +42,9 @@ class Principal < ActiveRecord::Base if q.blank? where({}) else - pattern = "%#{q}%" + pattern = "%#{q}%".gsub("/","//").gsub("_","/_") # sql = %w(login firstname lastname mail).map {|column| "LOWER(#{table_name}.#{column}) LIKE LOWER(:p)"}.join(" OR ") - sql= "LOWER(concat(lastname,firstname)) LIKE LOWER(:p) or LOWER(login) LIKE LOWER(:p) or LOWER(mail) LIKE LOWER(:p)" + sql= "LOWER(concat(lastname,firstname)) LIKE LOWER(:p) or LOWER(login) LIKE LOWER(:p) or LOWER(mail) LIKE LOWER(:p) escape '/'" params = {:p => pattern} if q =~ /^(.+)\s+(.+)$/ a, b = "#{$1}%", "#{$2}%" @@ -52,7 +52,7 @@ class Principal < ActiveRecord::Base sql << " OR (LOWER(#{table_name}.firstname) LIKE LOWER(:b) AND LOWER(#{table_name}.lastname) LIKE LOWER(:a))" params.merge!(:a => a, :b => b) end - where(sql, params) +p where(sql, params) end }