@@ -95,14 +95,14 class ProjectsController < ApplicationController | |||||
95 | @trackers = @project.rolled_up_trackers |
|
95 | @trackers = @project.rolled_up_trackers | |
96 |
|
96 | |||
97 | cond = @project.project_condition(Setting.display_subprojects_issues?) |
|
97 | cond = @project.project_condition(Setting.display_subprojects_issues?) | |
98 | Issue.visible_by(User.current) do |
|
98 | ||
99 |
|
|
99 | @open_issues_by_tracker = Issue.visible.count(:group => :tracker, | |
100 | :include => [:project, :status, :tracker], |
|
100 | :include => [:project, :status, :tracker], | |
101 | :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false]) |
|
101 | :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false]) | |
102 |
|
|
102 | @total_issues_by_tracker = Issue.visible.count(:group => :tracker, | |
103 | :include => [:project, :status, :tracker], |
|
103 | :include => [:project, :status, :tracker], | |
104 | :conditions => cond) |
|
104 | :conditions => cond) | |
105 |
|
|
105 | ||
106 | TimeEntry.visible_by(User.current) do |
|
106 | TimeEntry.visible_by(User.current) do | |
107 | @total_hours = TimeEntry.sum(:hours, |
|
107 | @total_hours = TimeEntry.sum(:hours, | |
108 | :include => :project, |
|
108 | :include => :project, |
@@ -270,12 +270,6 class Issue < ActiveRecord::Base | |||||
270 | @soonest_start ||= relations_to.collect{|relation| relation.successor_soonest_start}.compact.min |
|
270 | @soonest_start ||= relations_to.collect{|relation| relation.successor_soonest_start}.compact.min | |
271 | end |
|
271 | end | |
272 |
|
272 | |||
273 | def self.visible_by(usr) |
|
|||
274 | with_scope(:find => { :conditions => Project.visible_by(usr) }) do |
|
|||
275 | yield |
|
|||
276 | end |
|
|||
277 | end |
|
|||
278 |
|
||||
279 | def to_s |
|
273 | def to_s | |
280 | "#{tracker} ##{id}: #{subject}" |
|
274 | "#{tracker} ##{id}: #{subject}" | |
281 | end |
|
275 | end |
General Comments 0
You need to be logged in to leave comments.
Login now