diff options
| -rw-r--r-- | app/models/principal.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/principal.rb b/app/models/principal.rb index 90b56b6a1..8e7139c35 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -27,10 +27,10 @@ class Principal < ActiveRecord::Base scope :active, :conditions => "#{Principal.table_name}.status = 1" scope :like, lambda {|q| + q = q.to_s if q.blank? - {} + where({}) else - q = q.to_s pattern = "%#{q}%" sql = "LOWER(login) LIKE LOWER(:p) OR LOWER(firstname) LIKE LOWER(:p) OR LOWER(lastname) LIKE LOWER(:p) OR LOWER(mail) LIKE LOWER(:p)" params = {:p => pattern} @@ -39,7 +39,7 @@ class Principal < ActiveRecord::Base sql << " OR (LOWER(firstname) LIKE LOWER(:a) AND LOWER(lastname) LIKE LOWER(:b)) OR (LOWER(firstname) LIKE LOWER(:b) AND LOWER(lastname) LIKE LOWER(:a))" params.merge!(:a => a, :b => b) end - {:conditions => [sql, params]} + where(sql, params) end } |