kolan/obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor: inline the utility methods in ReportsController.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3404 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2010-02-10 16:59:58 +00:00
parent ed9eb2d684
commit a8a49a26a1
1 changed files with 16 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
app/controllers/reports_controller.rb
View File

@ -29,14 +29,15 @@ class ReportsController < ApplicationController
@assignees = @project.members.collect { |m| m.user }.sort @assignees = @project.members.collect { |m| m.user }.sort
@authors = @project.members.collect { |m| m.user }.sort @authors = @project.members.collect { |m| m.user }.sort
@subprojects = @project.descendants.active @subprojects = @project.descendants.active
issues_by_tracker
issues_by_version @issues_by_tracker = Issue.by_tracker(@project)
issues_by_priority @issues_by_version = Issue.by_version(@project)
issues_by_category @issues_by_priority = Issue.by_priority(@project)
issues_by_assigned_to @issues_by_category = Issue.by_category(@project)
issues_by_author @issues_by_assigned_to = Issue.by_assigned_to(@project)
issues_by_subproject @issues_by_author = Issue.by_author(@project)
@issues_by_subproject = Issue.by_subproject(@project) || []
render :template => "reports/issue_report" render :template => "reports/issue_report"
end end
@ -47,37 +48,37 @@ class ReportsController < ApplicationController
when "tracker" when "tracker"
@field = "tracker_id" @field = "tracker_id"
@rows = @project.trackers @rows = @project.trackers
@data = issues_by_tracker @data = Issue.by_tracker(@project)
@report_title = l(:field_tracker) @report_title = l(:field_tracker)
when "version" when "version"
@field = "fixed_version_id" @field = "fixed_version_id"
@rows = @project.shared_versions.sort @rows = @project.shared_versions.sort
@data = issues_by_version @data = Issue.by_version(@project)
@report_title = l(:field_version) @report_title = l(:field_version)
when "priority" when "priority"
@field = "priority_id" @field = "priority_id"
@rows = IssuePriority.all @rows = IssuePriority.all
@data = issues_by_priority @data = Issue.by_priority(@project)
@report_title = l(:field_priority) @report_title = l(:field_priority)
when "category" when "category"
@field = "category_id" @field = "category_id"
@rows = @project.issue_categories @rows = @project.issue_categories
@data = issues_by_category @data = Issue.by_category(@project)
@report_title = l(:field_category) @report_title = l(:field_category)
when "assigned_to" when "assigned_to"
@field = "assigned_to_id" @field = "assigned_to_id"
@rows = @project.members.collect { |m| m.user }.sort @rows = @project.members.collect { |m| m.user }.sort
@data = issues_by_assigned_to @data = Issue.by_assigned_to(@project)
@report_title = l(:field_assigned_to) @report_title = l(:field_assigned_to)
when "author" when "author"
@field = "author_id" @field = "author_id"
@rows = @project.members.collect { |m| m.user }.sort @rows = @project.members.collect { |m| m.user }.sort
@data = issues_by_author @data = Issue.by_author(@project)
@report_title = l(:field_author) @report_title = l(:field_author)
when "subproject" when "subproject"
@field = "project_id" @field = "project_id"
@rows = @project.descendants.active @rows = @project.descendants.active
@data = issues_by_subproject @data = Issue.by_subproject(@project) || []
@report_title = l(:field_subproject) @report_title = l(:field_subproject)
end end
@ -89,33 +90,5 @@ class ReportsController < ApplicationController
end end
end end
end end
private
def issues_by_tracker
@issues_by_tracker ||= Issue.by_tracker(@project)
end
def issues_by_version
@issues_by_version ||= Issue.by_version(@project)
end
def issues_by_priority
@issues_by_priority ||= Issue.by_priority(@project)
end
def issues_by_category
@issues_by_category ||= Issue.by_category(@project)
end
def issues_by_assigned_to
@issues_by_assigned_to ||= Issue.by_assigned_to(@project)
end
def issues_by_author
@issues_by_author ||= Issue.by_author(@project)
end
def issues_by_subproject
@issues_by_subproject ||= Issue.by_subproject(@project)
@issues_by_subproject ||= []
end
end end