comparison app/controllers/projects_controller.rb @ 1519:afce8026aaeb redmine-2.4-integration

Merge from branch "live"
author Chris Cannam
date Tue, 09 Sep 2014 09:34:53 +0100
parents c86dacc2ef0a ce4819fa2692
children a1bdbf8a87d5
comparison
equal deleted inserted replaced
1518:2e8063097240 1519:afce8026aaeb
57 @limit = per_page_option 57 @limit = per_page_option
58 @project_count = Project.visible_roots.count 58 @project_count = Project.visible_roots.count
59 @project_pages = Paginator.new self, @project_count, @limit, params['page'] 59 @project_pages = Paginator.new self, @project_count, @limit, params['page']
60 @offset ||= @project_pages.current.offset 60 @offset ||= @project_pages.current.offset
61 @projects = Project.visible_roots.all(:offset => @offset, :limit => @limit, :order => sort_clause) 61 @projects = Project.visible_roots.all(:offset => @offset, :limit => @limit, :order => sort_clause)
62 render :template => 'projects/index.html.erb', :layout => !request.xhr? 62 render :template => 'projects/index', :layout => !request.xhr?
63 63
64 ## Redmine 2.2: 64 ## Redmine 2.2:
65 # scope = Project 65 # scope = Project
66 # unless params[:closed] 66 # unless params[:closed]
67 # scope = scope.active 67 # scope = scope.active
83 # A different view of projects using explore boxes 83 # A different view of projects using explore boxes
84 def explore 84 def explore
85 respond_to do |format| 85 respond_to do |format|
86 format.html { 86 format.html {
87 @projects = Project.visible 87 @projects = Project.visible
88 render :template => 'projects/explore.html.erb', :layout => !request.xhr? 88 render :template => 'projects/explore', :layout => !request.xhr?
89 } 89 }
90 end 90 end
91 end 91 end
92 92
93 def new 93 def new