Merge pull request #37 from stbenjam/search

Add scoped search on saltmaster
theforeman · May 10, 2015 · 7f117f0 · 7f117f0
2 parents 1a592f1 + fd8a6c7
commit 7f117f0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb b/app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb
@@ -3,8 +3,9 @@ module HostsHelperExtensions
     extend ActiveSupport::Concern
 
     included do
-      alias_method_chain :host_title_actions, :salt_run
+      alias_method_chain :host_title_actions, :salt
       alias_method_chain :show_appropriate_host_buttons, :salt
+      alias_method_chain :overview_fields, :salt
     end
 
     def show_appropriate_host_buttons_with_salt(host)
@@ -13,7 +14,7 @@ def show_appropriate_host_buttons_with_salt(host)
                                  :title => _('Salt external nodes YAML dump'), :class => 'btn btn-default') unless host.salt_master.blank?)]).flatten.compact
     end
 
-    def host_title_actions_with_salt_run(host)
+    def host_title_actions_with_salt(host)
       title_actions(
         button_group(
           if host.try(:salt_proxy)
@@ -22,7 +23,16 @@ def host_title_actions_with_salt_run(host)
           end
         )
       )
-      host_title_actions_without_salt_run(host)
+      host_title_actions_without_salt(host)
+    end
+
+    def overview_fields_with_salt(host)
+      fields = overview_fields_without_salt(host)
+
+      fields.insert(5, [_("Salt Master"), (link_to(host.salt_proxy, hosts_path(:search => "saltmaster = #{host.salt_proxy}")) if host.salt_proxy)])
+      fields.insert(6, [_("Salt Environment"), (link_to(host.salt_environment, hosts_path(:search => "salt_environment = #{host.salt_environment}")) if host.salt_environment)])
+
+      fields
     end
   end
 end
diff --git a/app/models/foreman_salt/concerns/host_managed_extensions.rb b/app/models/foreman_salt/concerns/host_managed_extensions.rb
@@ -16,6 +16,7 @@ module HostManagedExtensions
 
         scoped_search :in => :salt_modules, :on => :name, :complete_value => true, :rename => :salt_state
         scoped_search :in => :salt_environment, :on => :name, :complete_value => true, :rename => :salt_environment
+        scoped_search :in => :salt_proxy, :on => :name, :complete_value => true, :rename => :saltmaster
 
         validate :salt_modules_in_host_environment
       end

diff --git a/app/models/foreman_salt/concerns/hostgroup_extensions.rb b/app/models/foreman_salt/concerns/hostgroup_extensions.rb
@@ -12,6 +12,7 @@ module HostgroupExtensions
 
         scoped_search :in => :salt_modules, :on => :name, :complete_value => true, :rename => :salt_state
         scoped_search :in => :salt_environment, :on => :name, :complete_value => true, :rename => :salt_environment
+        scoped_search :in => :salt_proxy, :on => :name, :complete_value => true, :rename => :saltmaster
       end
 
       def all_salt_modules