Mercurial > hg > soundsoftware-site

diff app/controllers/search_controller.rb @ 1338:25603efa57b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from live branch
author Chris Cannam
date Thu, 20 Jun 2013 13:14:14 +0100
parents bb32da3bea34
children 4f746d8966dd
line wrap: on
line diff
--- a/app/controllers/search_controller.rb	Wed Jan 23 13:11:25 2013 +0000
+++ b/app/controllers/search_controller.rb	Thu Jun 20 13:14:14 2013 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2011  Jean-Philippe Lang
+# Copyright (C) 2006-2012  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -34,7 +34,7 @@
       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