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

1 files changed, 2 insertions, 11 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 45a20bf05..61d1eada7 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -26,9 +26,6 @@ class AdminController < ApplicationController
   end
 	
   def projects
-    sort_init 'name', 'asc'
-    sort_update %w(name is_public created_on)
-    
     @status = params[:status] ? params[:status].to_i : 1
     c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
     
@@ -37,14 +34,8 @@ class AdminController < ApplicationController
       c << ["LOWER(identifier) LIKE ? OR LOWER(name) LIKE ?", name, name]
     end
     
-    @project_count = Project.count(:conditions => c.conditions)
-    @project_pages = Paginator.new self, @project_count,
-								per_page_option,
-								params['page']								
-    @projects = Project.find :all, :order => sort_clause,
-                        :conditions => c.conditions,
-						:limit  =>  @project_pages.items_per_page,
-						:offset =>  @project_pages.current.offset
+    @projects = Project.find :all, :order => 'lft',
+                                   :conditions => c.conditions
 
     render :action => "projects", :layout => false if request.xhr?
   end