foreman_salt 12.0.0 → 13.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b93dcc3ed4cb4806ab2b58c7843ce90375ecaf98ad307f978d3f4c151be7854
-  data.tar.gz: 3e8a71fd43af8e1b16dfb64a2c0450b5a0859a20f1642b639c326b4543ed4d66
+  metadata.gz: 36fe9df5ebf245a2e3d62f66a9368a16a71ad78bbf07ff4ac5dc6dada03ad515
+  data.tar.gz: 48f709a541f72c61e6fa5133f5b10e8de76fefc72e3c143a50e9b6e4069f92f8
 SHA512:
-  metadata.gz: 02a60d1d5fcd0f83d345f41e69843312ed355f3afeefc1fba9d715335289774b36fc48a462816b3b7698df79ba3c090430f7f69b4aa0457300e07b0842bed468
-  data.tar.gz: 348414476a5cb42f0b8d7999b49003775eaee02720f1a1488f9b8c84cb846d3bd7e50113768f75a3ff8545df8c5b17b9a5fdd13c262e2fd7240462425644f6ba
+  metadata.gz: 8bb26eeb33777bb1c8a763d2238d2c47ad613efc90090f562821344126a1c0df24e4b50669131902632b1a19958f322b243870b6cd5b59b182a5c4166cab6640
+  data.tar.gz: 6b11de698ddfa5bc6da7a8e1ce2ab839e092018b158179b2e56cb70ede9fdbb53f667b63ab81a53c4ce26bc2887555b963b229a8ec6ad622bd26bcec03e1e98b

data/app/models/foreman_salt/fact_name.rb

@@ -4,6 +4,10 @@ module ForemanSalt
   # in the fact values table (/fact_values)
   class FactName < ::FactName
     def origin
+      'Salt'
+    end
+
+    def icon_path
       'foreman_salt/Salt'
     end
   end

data/app/models/foreman_salt/salt_environment.rb

@@ -3,6 +3,7 @@ module ForemanSalt
     include Authorizable
     extend FriendlyId
     friendly_id :name
+    include Parameterizable::ByIdName
 
     has_many :hosts, :class_name => '::Host::Managed'
     has_many :hostgroups, :class_name => '::Hostgroup'

data/app/models/foreman_salt/salt_module.rb

@@ -3,6 +3,7 @@ module ForemanSalt
     include Authorizable
     extend FriendlyId
     friendly_id :name
+    include Parameterizable::ByIdName
 
     has_many :host_salt_modules, :foreign_key => :salt_module_id
     has_many :hosts, :through => :host_salt_modules, :class_name => '::Host::Managed'

data/app/models/setting/salt.rb

@@ -1,14 +1,13 @@
 class Setting::Salt < Setting
-  def self.load_defaults
-    return unless super
+  def self.default_settings
+    [
+      set('salt_namespace_pillars', N_("Namespace Foreman pillars under 'foreman' key"), false),
+      set('salt_hide_run_salt_button', N_("Hide the Run Salt state.highstate button on the host details page"), false)
+    ]
+  end
 
-    transaction do
-      [
-        set('salt_namespace_pillars', N_("Namespace Foreman pillars under 'foreman' key"), false),
-        set('salt_hide_run_salt_button', N_("Hide the Run Salt state.highstate button on the host details page"), false)
-      ].each { |s| self.create! s.update(:category => 'Setting::Salt') }
-      Setting['salt_hide_run_salt_button'] = true if ForemanSalt.with_remote_execution?
-    end
-    true
+  def self.load_defaults
+    super
+    Setting['salt_hide_run_salt_button'] = true if ForemanSalt.with_remote_execution?
   end
 end

data/app/views/hosts/select_multiple_salt_environment.html.erb

@@ -4,5 +4,5 @@
     <%= selectable_f f, :id, [[_("Select salt environment"), "None"]] +
                         [[_("*Clear environment*"), ""]] +
                         ForemanSalt::SaltEnvironment.all.map{|e| [e.name, e.id]},{},
-                        :label => _("Salt Environment"), :onchange => "toggle_multiple_ok_button(this)" %>
+                        :label => _("Salt Environment"), :onchange => "tfm.hosts.table.toggleMultipleOkButton(this)" %>
 <% end %>

data/lib/foreman_salt/plugin.rb

@@ -2,7 +2,7 @@
 
 # rubocop:disable BlockLength
 Foreman::Plugin.register :foreman_salt do
-  requires_foreman '>= 1.19'
+  requires_foreman '>= 1.24'
 
   apipie_documented_controllers ["#{ForemanSalt::Engine.root}/app/controllers/foreman_salt/api/v2/*.rb"]
 

data/lib/foreman_salt/version.rb

@@ -1,3 +1,3 @@
 module ForemanSalt
-  VERSION = '12.0.0'
+  VERSION = '13.0.0'
 end

data/test/unit/salt_fact_importer_test.rb

@@ -17,7 +17,8 @@ module ForemanSalt
       importer.import!
       imported_fact = FactName.find_by_name('a')
       assert_equal 'a', imported_fact.name
-      assert_equal 'foreman_salt/Salt', imported_fact.origin
+      assert_equal 'Salt', imported_fact.origin
+      assert_equal 'foreman_salt/Salt', imported_fact.icon_path
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 12.0.0
+  version: 13.0.0
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2019-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement