From 0aa63a13bc4239cb866779a18d8146077fc77980 Mon Sep 17 00:00:00 2001 From: Etienne Massip Date: Mon, 3 Oct 2011 20:17:01 +0000 Subject: [PATCH] Qualify searchable @text@ column to prevent exception thrown when :content association is not eargerly fetched by AR (#9308). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7568 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/wiki_page.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 27ab4f570..92b72af8f 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -30,7 +30,7 @@ class WikiPage < ActiveRecord::Base :datetime => :created_on, :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :id => o.title}} - acts_as_searchable :columns => ['title', 'text'], + acts_as_searchable :columns => ['title', "#{WikiContent.table_name}.text"], :include => [{:wiki => :project}, :content], :permission => :view_wiki_pages, :project_key => "#{Wiki.table_name}.project_id" -- 2.39.5