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
This commit is contained in:
commit
3d03a3eda5
|
@ -26,7 +26,7 @@ class WikiPage < ActiveRecord::Base
|
||||||
:datetime => :created_on,
|
:datetime => :created_on,
|
||||||
:url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :id => o.title}}
|
: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],
|
:include => [{:wiki => :project}, :content],
|
||||||
:project_key => "#{Wiki.table_name}.project_id"
|
:project_key => "#{Wiki.table_name}.project_id"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue