From 1a6425654698b4f4ea855dc1097747f74053577a Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 11 Feb 2014 14:09:23 +0100 Subject: [PATCH] Improved std. fallback sql. --- app/models/organization/search.rb | 3 ++- app/models/ticket/search.rb | 2 ++ app/models/user/search.rb | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/models/organization/search.rb b/app/models/organization/search.rb index 2e82326e2..c0d057c96 100644 --- a/app/models/organization/search.rb +++ b/app/models/organization/search.rb @@ -39,7 +39,8 @@ returns end # fallback do sql query - # do query + # - stip out * we already search for *query* - + query.gsub! '*', '' organizations = Organization.find( :all, :limit => limit, diff --git a/app/models/ticket/search.rb b/app/models/ticket/search.rb index c67f7f6d0..d61469584 100644 --- a/app/models/ticket/search.rb +++ b/app/models/ticket/search.rb @@ -85,6 +85,8 @@ returns end # do query + # - stip out * we already search for *query* - + query.gsub! '*', '' tickets_all = Ticket.select('DISTINCT(tickets.id)'). where(conditions). where( '( `tickets`.`title` LIKE ? OR `tickets`.`number` LIKE ? OR `ticket_articles`.`body` LIKE ? OR `ticket_articles`.`from` LIKE ? OR `ticket_articles`.`to` LIKE ? OR `ticket_articles`.`subject` LIKE ?)', "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%" ). diff --git a/app/models/user/search.rb b/app/models/user/search.rb index b2d63a127..c372d8ae1 100644 --- a/app/models/user/search.rb +++ b/app/models/user/search.rb @@ -55,7 +55,8 @@ returns end # fallback do sql query - # do query + # - stip out * we already search for *query* - + query.gsub! '*', '' users = User.find( :all, :limit => limit,