merge upstream reporting_merge

git-svn-id: https://dev.finn.de/svn/cockpit/branches/reporting_merge@1766 7926756e-e54e-46e6-9721-ed318f58905e
14 years ago · 1e55977f48
parent bb53506136
commit 1e55977f48
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/cost_reports_controller.rb
+++ b/app/controllers/cost_reports_controller.rb
@ -2,12 +2,12 @@ class CostReportsController < ApplicationController
  before_filter :find_optional_project, :only => [:index]
  before_filter :generate_query, :only => [:index]
  before_filter :load_all
+  before_filter :set_cost_type, :only => [:index]

  helper :reporting
  include ReportingHelper

  def index
-    set_cost_type
    if @query.group_bys.empty?
      @table_partial = "cost_entry_table"
    elsif @query.depth_of(:column) + @query.depth_of(:row) == 1