suzanne.soy/redmine-graphs-plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing total issues when a project has no descendants

Browse Source
This commit is contained in:
Brad Beattie 2009-05-14 13:04:30 -07:00
parent 9c7cd890b7
commit c8a4bc73af
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/graphs_controller.rb
View File

@ -105,7 +105,7 @@ class GraphsController < ApplicationController
sql << " WHERE (%s)" % Project.allowed_to_condition(User.current, :view_issues) sql << " WHERE (%s)" % Project.allowed_to_condition(User.current, :view_issues)
unless @project.nil? unless @project.nil?
sql << " AND (project_id = #{@project.id}" sql << " AND (project_id = #{@project.id}"
sql << " OR project_id IN (%s)" % @project.descendants.active.visible.collect { |p| p.id }.join(',') unless @project.descendants.active.visible.nil? sql << " OR project_id IN (%s)" % @project.descendants.active.visible.collect { |p| p.id }.join(',') unless @project.descendants.active.visible.empty?
sql << " )" sql << " )"
end end
sql << " GROUP BY project_id" sql << " GROUP BY project_id"
@ -261,8 +261,14 @@ class GraphsController < ApplicationController
def find_open_issues def find_open_issues
find_optional_project find_optional_project
@issues = Issue.visible.find(:all, :include => [:status], :conditions => ["#{IssueStatus.table_name}.is_closed=?", false]) if @project.nil? if !@project.nil?
@issues = @project.issues.collect { |issue| issue unless issue.closed? }.compact unless @project.nil? ids = [@project.id]
ids += @project.descendants.active.visible.collect(&:id)
@issues = Issue.visible.find(:all, :include => [:status], :conditions => ["#{Project.table_name}.id IN (?) AND #{IssueStatus.table_name}.is_closed=?", ids.join(','), false])
params[:asdfadfasdf] = @issues
else
@issues = Issue.visible.find(:all, :include => [:status], :conditions => ["#{IssueStatus.table_name}.is_closed=?", false])
end
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
render_404 render_404
end end