comparison app/controllers/projects_controller.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch
author Chris Cannam
date Tue, 09 Sep 2014 09:29:00 +0100
parents e248c7af89ec
children a1bdbf8a87d5
comparison
equal deleted inserted replaced
1516:b450a9d58aed 1517:dffacf8a6908
149 @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").all 149 @news = @project.news.limit(5).includes(:author, :project).reorder("#{News.table_name}.created_on DESC").all
150 @trackers = @project.rolled_up_trackers 150 @trackers = @project.rolled_up_trackers
151 151
152 cond = @project.project_condition(Setting.display_subprojects_issues?) 152 cond = @project.project_condition(Setting.display_subprojects_issues?)
153 153
154 @open_issues_by_tracker = Issue.visible.open.where(cond).count(:group => :tracker) 154 @open_issues_by_tracker = Issue.visible.open.where(cond).group(:tracker).count
155 @total_issues_by_tracker = Issue.visible.where(cond).count(:group => :tracker) 155 @total_issues_by_tracker = Issue.visible.where(cond).group(:tracker).count
156 156
157 if User.current.allowed_to?(:view_time_entries, @project) 157 if User.current.allowed_to?(:view_time_entries, @project)
158 @total_hours = TimeEntry.visible.where(cond).sum(:hours).to_f 158 @total_hours = TimeEntry.visible.where(cond).sum(:hours).to_f
159 end 159 end
160 160