From bad74a9fdbffd5f29be0ecc21f6e2aef52a8af36 Mon Sep 17 00:00:00 2001 From: lpichler Date: Tue, 5 Feb 2019 16:58:22 +0100 Subject: [PATCH] Don't format chargeback rate column in MiqReport::Formatting --- app/models/chargeback.rb | 4 ++++ app/models/miq_report/formatting.rb | 2 ++ 2 files changed, 6 insertions(+) diff --git a/app/models/chargeback.rb b/app/models/chargeback.rb index 652b9af3222..b6fe07dc3cf 100644 --- a/app/models/chargeback.rb +++ b/app/models/chargeback.rb @@ -268,6 +268,10 @@ def self.default_column_for_format(col) end end + def self.rate_column?(col) + col.ends_with?("_rate") + end + private def relevant_fields diff --git a/app/models/miq_report/formatting.rb b/app/models/miq_report/formatting.rb index b8e9df15137..dd77a8ae800 100644 --- a/app/models/miq_report/formatting.rb +++ b/app/models/miq_report/formatting.rb @@ -37,6 +37,8 @@ def format(col, value, options = {}) end end + # TODO: remove this and update storing column format to instance of report in UI (this requires migration) + options[:format] = :_none_ if Chargeback.db_is_chargeback?(db) && Chargeback.rate_column?(col.to_s) col = Chargeback.default_column_for_format(col.to_s) if Chargeback.db_is_chargeback?(db) format = options.delete(:format)