Commit 32bd9688 authored by emassip's avatar emassip

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

Qualify searchable @text@ column to prevent exception thrown when :content association is not eargerly fetched by AR (#9308).

git-svn-id: https://svn.redmine.org/redmine/trunk@7568 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent a8da23ec
......@@ -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"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment