summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-02-26 11:42:29 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-02-26 11:42:29 +0000
commit65b4d8a649d7c9aac6a34502017239799ac7e7b7 (patch)
tree95673cf8ef591e4c5a97e52d2d1eba4b91cc0b78
parent3363e4f7905e0cc41bbe671fd397529c7e0b6744 (diff)
downloadredmine-65b4d8a649d7c9aac6a34502017239799ac7e7b7.tar.gz
redmine-65b4d8a649d7c9aac6a34502017239799ac7e7b7.zip
Make sure that projects_to_search is a Project Array.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9013 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/controllers/search_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 3c8258dbf..4d4e69d27 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -34,7 +34,7 @@ class SearchController < ApplicationController
when 'my_projects'
User.current.memberships.collect(&:project)
when 'subprojects'
- @project ? (@project.self_and_descendants.active) : nil
+ @project ? (@project.self_and_descendants.active.all) : nil
else
@project
end