comparison app/controllers/projects_controller.rb @ 767:dd33798e514d feature_14

Reverts changes made to Redmine Core's Projects Controller in commit:b2a9e64b8283. Pagination now being done for both normal and filtered projects index.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Tue, 15 Nov 2011 15:03:17 +0000
parents b2a9e64b8283
children 7614169e14ed
comparison
equal deleted inserted replaced
766:332e4287f4d3 767:dd33798e514d
53 sort_update %w(name lft created_on updated_on) 53 sort_update %w(name lft created_on updated_on)
54 @limit = per_page_option 54 @limit = per_page_option
55 @project_count = Project.visible_roots.count 55 @project_count = Project.visible_roots.count
56 @project_pages = Paginator.new self, @project_count, @limit, params['page'] 56 @project_pages = Paginator.new self, @project_count, @limit, params['page']
57 @offset ||= @project_pages.current.offset 57 @offset ||= @project_pages.current.offset
58 @projects = Project.visible_roots.find(@filtered_projects, :offset => @offset, :limit => @limit, :order => sort_clause) 58 @projects = Project.visible_roots.all(:offset => @offset, :limit => @limit, :order => sort_clause)
59 if User.current.logged? 59 if User.current.logged?
60 # seems sort_by gives us case-sensitive ordering, which we don't want 60 # seems sort_by gives us case-sensitive ordering, which we don't want
61 # @user_projects = User.current.projects.sort_by(&:name) 61 # @user_projects = User.current.projects.sort_by(&:name)
62 @user_projects = User.current.projects.all(:order => :name) 62 @user_projects = User.current.projects.all(:order => :name)
63 end 63 end