Merge pull request #1170 from jntullo/bz/style_report_columns

Parse the column/field name correctly in reports
ManageIQ · Jun 7, 2017 · 7da9572 · 7da9572
2 parents ba8bd2e + c85cea2
commit 7da9572
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/report_controller/reports/editor.rb b/app/controllers/report_controller/reports/editor.rb
@@ -417,7 +417,7 @@ def gfv_key_style(key, value)
     f = @edit[:new][:field_order][f_idx]  # Get the field element
     field_sub_type = MiqExpression.get_col_info(f.last)[:format_sub_type]
     field_data_type = MiqExpression.get_col_info(f.last)[:data_type]
-    field_name = f.last.include?(".") ? f.last.split(".").last.tr("-", ".") : f.last.split("-").last
+    field_name = MiqExpression.parse_field_or_tag(f.last).report_column
     case parm
     when "style"  # New CSS class chosen
       if value.blank?

diff --git a/app/views/report/_form_styling.html.haml b/app/views/report/_form_styling.html.haml
@@ -18,7 +18,7 @@
     %tbody
       - @edit[:new][:field_order].each_with_index do |f, f_idx|
         - field_type = MiqExpression.get_col_info(f.last.split("__").first)[:format_sub_type]
-        - col_name = f.last.include?(".") ? f.last.split(".").last.gsub("-", ".") : f.last.split("-").last
+        - col_name = MiqExpression.parse_field_or_tag(f.last).report_column
         - styles = @edit.fetch_path(:new, :col_options, col_name, :style) || []
         %tr
           %td