Commit 3d03a3ed authored by Felix Schäfer's avatar Felix Schäfer

Merge pull request #96 from finnlabs/pulls/573/fix_aas_in_wiki_content

[#573] acts_as_searchable definition in WikiPage may be insufficient and cause SQL errors
parents eae5c9af 962b35e1
......@@ -26,7 +26,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 => ["#{WikiPage.table_name}.title", "#{WikiContent.table_name}.text"],
:include => [{:wiki => :project}, :content],
: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