Qualify searchable @text@ column to prevent exception thrown when :content associatio...

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7568 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 27ab4f570b221a796e175f89f28041e59bb25964..92b72af8f9750018aadebfe88d708fa0f7b3f886 100644 (file)
--- 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"