summaryrefslogtreecommitdiffstats
path: root/app/models/wiki_page.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-05-18 16:15:22 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-05-18 16:15:22 +0000
commit073818f8bc46580e118a7550f1faaa55b3be13d9 (patch)
tree6ea9ab7a218ecdac7f4fba61f339e17d0459f04d /app/models/wiki_page.rb
parent1907c31138d065aea93f53b8e7565e06a44e49f8 (diff)
downloadredmine-073818f8bc46580e118a7550f1faaa55b3be13d9.tar.gz
redmine-073818f8bc46580e118a7550f1faaa55b3be13d9.zip
Ability to search all projects or the projects the user belongs to (#791).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1435 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/wiki_page.rb')
-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 95750f37b..65fc1f68c 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -29,7 +29,7 @@ class WikiPage < ActiveRecord::Base
:url => Proc.new {|o| {:controller => 'wiki', :id => o.wiki.project_id, :page => o.title}}
acts_as_searchable :columns => ['title', 'text'],
- :include => [:wiki, :content],
+ :include => [{:wiki => :project}, :content],
:project_key => "#{Wiki.table_name}.project_id"
attr_accessor :redirect_existing_links