From 9a5f4a83a78bb293340732a3b620dece4dbae562 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 9 Dec 2007 22:01:16 +0000 Subject: [PATCH] Removed with_scope call in SearchController (it's now a protected AR::Base method). git-svn-id: http://redmine.rubyforge.org/svn/branches/work@970 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- rails-2.0/app/controllers/search_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rails-2.0/app/controllers/search_controller.rb b/rails-2.0/app/controllers/search_controller.rb index ee4f863aa..69e1ee503 100644 --- a/rails-2.0/app/controllers/search_controller.rb +++ b/rails-2.0/app/controllers/search_controller.rb @@ -90,9 +90,10 @@ class SearchController < ApplicationController end else operator = @all_words ? ' AND ' : ' OR ' - Project.with_scope(:find => {:conditions => Project.visible_by(User.current)}) do - @results += Project.find(:all, :limit => limit, :conditions => [ (["(LOWER(name) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'projects' - end + @results += Project.find(:all, + :limit => limit, + :conditions => [ (["(#{Project.visible_by(User.current)}) AND (LOWER(name) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] + ) if @scope.include? 'projects' # if only one project is found, user is redirected to its overview redirect_to :controller => 'projects', :action => 'show', :id => @results.first and return if @results.size == 1 end