foreman_salt 7.0.2 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2936d97abe52cb693b707b70efe7202cc88e5d7
-  data.tar.gz: d89d2744669bf971479183f366704e7d358f0fe4
+  metadata.gz: 5f1b578f746a23b4baddb585b865e87b6db90232
+  data.tar.gz: 2a177763f30f68bc12ba770e180a562f5abda4e1
 SHA512:
-  metadata.gz: b7bce3bc44a5aade9c39f8fab76eb9d284f0aa14c518f2dde18e72c1b79939d52dfea1b1f98a5e7051c43ef4bd9732ee704a07b0caeb35dd28fd7cfd4ba05908
-  data.tar.gz: 2d89a9a3d209cd6bf6e0536a21e69ccbbf6ee1104f4e65d64aaa9e0c9f9c04a49ffc357759738c143391b656be4bda13b78398464f4c2113231677261b152799
+  metadata.gz: c9c99556833b1a240f5594398862fcf59413eda02bdcf53b54c639309fa25b667839f7fbf112e2365ee92f5b956a96c2441edcfe997d7cc6f1e0d85abbfe7c28
+  data.tar.gz: 7604ba5ee0dd35f4505ff74e70bb24fadb6887facf87d7f30c2d9781d34030d8976a0c2ff037cceb3546bc20934b2975b65b4cac9a0b64e5309a193539287a1b

data/app/assets/javascripts/foreman_salt/states.js

@@ -20,7 +20,7 @@ function update_salt_states(element) {
     return;
   }
 
-  foreman.tools.showSpinner();
+  tfm.tools.showSpinner();
   $.ajax({
     type: 'put',
     url:  url,
@@ -31,7 +31,7 @@ function update_salt_states(element) {
       multiSelectOnLoad();
     },
     complete: function() {
-      foreman.tools.hideSpinner();
+      tfm.tools.hideSpinner();
     }
   });
 }

data/app/controllers/foreman_salt/minions_controller.rb

@@ -73,9 +73,9 @@ module ForemanSalt
           @minion      = @minion.becomes(Host::Managed)
           @minion.type = 'Host::Managed'
         end
-        @minion.attributes = params[:host]
+        @minion.attributes = host_params(:host)
       else
-        @minion ||= Host::Managed.new(params[:host])
+        @minion ||= Host::Managed.new(host_params(:host))
       end
 
       @obj = @minion

data/app/models/foreman_salt/concerns/host_managed_extensions.rb

@@ -11,8 +11,8 @@ module ForemanSalt
         belongs_to :salt_environment, :class_name => 'ForemanSalt::SaltEnvironment'
 
         alias_method_chain :params, :salt_proxy
-        alias_method_chain :set_hostgroup_defaults, :salt_proxy
         alias_method_chain :smart_proxy_ids, :salt_proxy
+        alias_method_chain :inherited_attributes, :salt
         alias_method_chain :configuration?, :salt
 
         scoped_search :in => :salt_modules, :on => :name, :complete_value => true, :rename => :salt_state
@@ -58,10 +58,8 @@ module ForemanSalt
         false
       end
 
-      def set_hostgroup_defaults_with_salt_proxy
-        return unless hostgroup
-        assign_hostgroup_attributes(%w(salt_proxy_id salt_environment_id))
-        set_hostgroup_defaults_without_salt_proxy
+      def inherited_attributes_with_salt
+        inherited_attributes_without_salt + %w(salt_proxy_id salt_environment_id)
       end
 
       def smart_proxy_ids_with_salt_proxy

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '7.0.2'
+  VERSION = '7.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.0.3
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Foreman Plug-in for Salt