diff app/controllers/projects_controller.rb @ 762:7dc4d205233e cannam

Merge from branch "feature_14"

--- a/app/controllers/projects_controller.rb	Fri Nov 11 16:04:44 2011 +0000
+++ b/app/controllers/projects_controller.rb	Tue Nov 15 10:34:25 2011 +0000
@@ -55,7 +55,7 @@
         @project_count = Project.visible_roots.count
         @project_pages = Paginator.new self, @project_count, @limit, params['page']
         @offset ||= @project_pages.current.offset
-        @projects = Project.visible_roots.all(:offset => @offset, :limit => @limit, :order => sort_clause) 
+        @projects = Project.visible_roots.find(@filtered_projects, :offset => @offset, :limit => @limit, :order => sort_clause) 
         if User.current.logged?
           # seems sort_by gives us case-sensitive ordering, which we don't want
 #          @user_projects = User.current.projects.sort_by(&:name)