Refactor: inline the utility methods in ReportsController.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3404 e93f8b46-1217-0410-a6f0-8f06a7374b81

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