| @@ -156,12 +156,8 class ProjectsController < ApplicationController | |||||
| 156 |
|
156 | |||
| 157 | cond = @project.project_condition(Setting.display_subprojects_issues?) |
|
157 | cond = @project.project_condition(Setting.display_subprojects_issues?) | |
| 158 |
|
158 | |||
| 159 |
@open_issues_by_tracker = Issue.visible.count(:group => :tracker |
|
159 | @open_issues_by_tracker = Issue.visible.open.where(cond).count(:group => :tracker) | |
| 160 | :include => [:project, :status, :tracker], |
|
160 | @total_issues_by_tracker = Issue.visible.where(cond).count(:group => :tracker) | |
| 161 | :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false]) |
|
|||
| 162 | @total_issues_by_tracker = Issue.visible.count(:group => :tracker, |
|
|||
| 163 | :include => [:project, :status, :tracker], |
|
|||
| 164 | :conditions => cond) |
|
|||
| 165 |
|
161 | |||
| 166 | if User.current.allowed_to?(:view_time_entries, @project) |
|
162 | if User.current.allowed_to?(:view_time_entries, @project) | |
| 167 | @total_hours = TimeEntry.visible.sum(:hours, :include => :project, :conditions => cond).to_f |
|
163 | @total_hours = TimeEntry.visible.sum(:hours, :include => :project, :conditions => cond).to_f | |
General Comments 0
You need to be logged in to leave comments.
Login now