comparison app/controllers/projects_controller.rb @ 1210:16826c3afbba redmine-2.2-integration

Merge from branch "live"
author Chris Cannam
date Wed, 23 Jan 2013 13:15:33 +0000
parents cd2db8872493 91db8e091f10
children 1aee31f54e13
comparison
equal deleted inserted replaced
1163:ad10dc713462 1210:16826c3afbba
56 @limit = per_page_option 56 @limit = per_page_option
57 @project_count = Project.visible_roots.count 57 @project_count = Project.visible_roots.count
58 @project_pages = Paginator.new self, @project_count, @limit, params['page'] 58 @project_pages = Paginator.new self, @project_count, @limit, params['page']
59 @offset ||= @project_pages.current.offset 59 @offset ||= @project_pages.current.offset
60 @projects = Project.visible_roots.all(:offset => @offset, :limit => @limit, :order => sort_clause) 60 @projects = Project.visible_roots.all(:offset => @offset, :limit => @limit, :order => sort_clause)
61 if User.current.logged?
62 # seems sort_by gives us case-sensitive ordering, which we don't want
63 # @user_projects = User.current.projects.sort_by(&:name)
64 @user_projects = User.current.projects.all(:order => :name)
65 end
66 render :template => 'projects/index.html.erb', :layout => !request.xhr? 61 render :template => 'projects/index.html.erb', :layout => !request.xhr?
67 62
68 ## Redmine 2.2: 63 ## Redmine 2.2:
69 # scope = Project 64 # scope = Project
70 # unless params[:closed] 65 # unless params[:closed]