summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2014-12-26 12:23:05 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2014-12-26 12:23:05 +0000
commit1699e37a0cad57f20ca1c8395314901dc59010f3 (patch)
treef09770c2ea3e95e652bf47422107ad348b60ef18
parenta9e53531d3ecd951052d5693ee61ae51fd606a3e (diff)
downloadredmine-1699e37a0cad57f20ca1c8395314901dc59010f3.tar.gz
redmine-1699e37a0cad57f20ca1c8395314901dc59010f3.zip
Preload wiki page content for search results.
git-svn-id: http://svn.redmine.org/redmine/trunk@13814 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/models/wiki_page.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 8d81bce7e..32d043355 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -34,7 +34,7 @@ class WikiPage < ActiveRecord::Base
acts_as_searchable :columns => ['title', "#{WikiContent.table_name}.text"],
:scope => joins(:content, {:wiki => :project}),
- :preload => {:wiki => :project},
+ :preload => [:content, {:wiki => :project}],
:permission => :view_wiki_pages,
:project_key => "#{Wiki.table_name}.project_id"