Skip to content

Commit

Permalink
Merge pull request #14631 from isimluk/fix-ui-specs
Browse files Browse the repository at this point in the history
Fix ui-classic specs
(cherry picked from commit 3ef6c68)
  • Loading branch information
martinpovolny authored and simaishi committed Apr 4, 2017
1 parent da581b7 commit 25708ed
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/models/miq_report.rb
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def self.get_col_info(path)
{
:data_type => data_type,
:available_formats => get_available_formats(path, data_type),
:default_format => Formats.get_default_format_path(path, data_type),
:default_format => Formats.default_format_path(path, data_type),
:numeric => [:integer, :decimal, :fixnum, :float].include?(data_type)
}
end
Expand Down
2 changes: 1 addition & 1 deletion app/models/miq_report/formatting.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def get_available_formats(path, dt)
end

def javascript_format(col, format_name)
format_name ||= MiqReport::Formats.get_default_format_path(col, nil)
format_name ||= MiqReport::Formats.default_format_path(col, nil)
return nil unless format_name && format_name != :_none_

format = MiqReport::Formats.details(format_name)
Expand Down

0 comments on commit 25708ed

Please sign in to comment.