diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-01-24 11:31:15 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2009-01-24 11:31:15 +0000 |
| commit | c9906480d3f279977720dc3f61534f4a5b77d1d2 (patch) | |
| tree | 23d1ad1fc0a9435bcb703033dd7b5069ac565005 /app/controllers/search_controller.rb | |
| parent | 51b745470c1d71b92072210a008f29c5d5a945d1 (diff) | |
| download | redmine-c9906480d3f279977720dc3f61534f4a5b77d1d2.tar.gz redmine-c9906480d3f279977720dc3f61534f4a5b77d1d2.zip | |
Merged nested projects branch. Removes limit on subproject nesting (#594).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2304 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/search_controller.rb')
| -rw-r--r-- | app/controllers/search_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index e6e66f05c..485d2349d 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 ] + @project.active_children) : nil + @project ? (@project.self_and_descendants.active) : nil else @project end |