Skip to content

Instantly share code, notes, and snippets.

@GregSutcliffe
Created June 23, 2014 12:59
Show Gist options
  • Select an option

  • Save GregSutcliffe/adbf42c6a86ed548e213 to your computer and use it in GitHub Desktop.

Select an option

Save GregSutcliffe/adbf42c6a86ed548e213 to your computer and use it in GitHub Desktop.
diff --git a/app/helpers/foreman_column_view/hosts_helper.rb b/app/helpers/foreman_column_view/hosts_helper.rb
index d52b1a2..2319326 100644
--- a/app/helpers/foreman_column_view/hosts_helper.rb
+++ b/app/helpers/foreman_column_view/hosts_helper.rb
@@ -2,12 +2,12 @@ module ForemanColumnView
module HostsHelper
def fcv_title(column)
- title = SETTINGS[:column_view][column.to_sym][:title]
+ title = SETTINGS[:column_view][column][:title]
return title
end
def fcv_content(host, column)
- content = SETTINGS[:column_view][column.to_sym][:content]
+ content = SETTINGS[:column_view][column][:content]
if content =~ /(.*)\[(.*)\]/
return host.send($1)[$2.gsub(/['"]/,'')]
else
diff --git a/app/helpers/foreman_column_view/hosts_helper_extension.rb b/app/helpers/foreman_column_view/hosts_helper_extension.rb
index 5b544bc..1e7b678 100644
--- a/app/helpers/foreman_column_view/hosts_helper_extension.rb
+++ b/app/helpers/foreman_column_view/hosts_helper_extension.rb
@@ -11,8 +11,8 @@ module ForemanColumnView
valid_views = [:hosts_properties]
SETTINGS[:column_view].reject { |k,v| !valid_views.include?(v[:view]) }.keys.sort.map do |k|
- after = SETTINGS[:column_view][k.to_sym][:after]
- conditional = SETTINGS[:column_view][k.to_sym][:conditional]
+ after = SETTINGS[:column_view][k][:after]
+ conditional = SETTINGS[:column_view][k][:conditional]
if conditional.present?
method = conditional[0].to_sym
args = conditional.drop(1)
@@ -28,8 +28,8 @@ module ForemanColumnView
# This won't work well with i18n, use row numbers instead
after = fields.find_index { |r| r[0].include? after } unless after.is_a? Fixnum
- eval_content = SETTINGS[:column_view][k.to_sym][:eval_content]
- content = eval_content ? eval(SETTINGS[:column_view][k.to_sym][:content]) :
+ eval_content = SETTINGS[:column_view][k][:eval_content]
+ content = eval_content ? eval(SETTINGS[:column_view][k][:content]) :
fcv_content(host, k)
fields.insert(after || -1, [fcv_title(k), content])
diff --git a/app/overrides/add_column_content.rb b/app/overrides/add_column_content.rb
index 433db6d..03a6472 100644
--- a/app/overrides/add_column_content.rb
+++ b/app/overrides/add_column_content.rb
@@ -1,6 +1,6 @@
if SETTINGS[:column_view]
SETTINGS[:column_view].reject { |k,v| v[:view] && v[:view] != :hosts_list }.keys.sort.map do |k|
- after = SETTINGS[:column_view][k.to_sym][:after]
+ after = SETTINGS[:column_view][k][:after]
Deface::Override.new(
:virtual_path => "hosts/_list",
:name => "content_#{k}",
diff --git a/app/overrides/add_column_title.rb b/app/overrides/add_column_title.rb
index 849d688..18b6d9a 100644
--- a/app/overrides/add_column_title.rb
+++ b/app/overrides/add_column_title.rb
@@ -1,6 +1,6 @@
if SETTINGS[:column_view]
SETTINGS[:column_view].reject { |k,v| v[:view] && v[:view] != :hosts_list }.keys.sort.map do |k|
- after = SETTINGS[:column_view][k.to_sym][:after]
+ after = SETTINGS[:column_view][k][:after]
Deface::Override.new(
:virtual_path => "hosts/_list",
:name => "title_#{k}",
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment