foreman_openscap 5.2.1 → 5.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92bab404c3bb495719fa2ecf62c84cdcea0cf42a4fe9cdc7f07fc6a99341a803
-  data.tar.gz: 36cd15417a6f421c8424b4f24cfa21e1ec09f59d297955db6a0a8f97e90c6adf
+  metadata.gz: 567fbb46d134ce11280b987a4f08aa07e2be3cbcb59a4401c845445fc35bc18d
+  data.tar.gz: 1c5f824f9909e205970e0ac17bf6326a0f345f162b586048d80bfe7fe7037dcc
 SHA512:
-  metadata.gz: d4713c26ae5f19cf96cf2ae88900a078457646e57a1fce213f1d63b430a1468d89d0a6ae0ae29cced95456c643a0c469f46c2eafeb5c9fe2f870f7c589b44ade
-  data.tar.gz: ebbfd812e483cd88aa6dc279f17734eac782c97a3c8696be7879a41961fe6e79ee3b7f6342726faa6220a275ea48b3edf8292bc14424a8f87f01968749cf3c72
+  metadata.gz: 177272d8e28eddfdc6f98b21bccacd580d8b37a26f931781558a52cbf6dc8fd9d36f5963d3da783de4449bef397d60dfd25ca8bc93c2883f370e37ea5b27679a
+  data.tar.gz: 5cac704dc905427ad4f15a325cf250a18755fff8407edc764a5f11752a7da15391d7c9bde6f53e4577b942e27b5d588ad952d656cf5ebada0d334f62fbfa5e62

data/app/services/foreman_openscap/client_config/ansible.rb

@@ -16,7 +16,7 @@ module ForemanOpenscap
       end
 
       def available?
-        defined?(ForemanAnsible)
+        Foreman::Plugin.installed?("foreman_ansible")
       end
 
       def inline_help

data/app/services/foreman_openscap/client_config/puppet.rb

@@ -10,7 +10,7 @@ module ForemanOpenscap
       end
 
       def available?
-        defined?(ForemanPuppet)
+        Foreman::Plugin.installed?("foreman_puppet")
       end
 
       def inline_help

data/app/views/arf_reports/show.html.erb

@@ -14,7 +14,7 @@
 
 <%= title_actions link_to(_('Back'), :back, :class => "btn btn-default"),
   display_delete_if_authorized(hash_for_arf_report_path(:id => @arf_report), :class=> "btn btn-default"),
-  link_to(_("Host details"), @arf_report.host, :class => "btn btn-default"),
+  link_to(_("Host details"), current_host_details_path(:id => @arf_report.host), :class => "btn btn-default"),
   link_to(_("View full report"), show_html_arf_report_path(:id => @arf_report.id), :class => "btn btn-primary"),
   link_to(_("Download XML in bzip"), parse_bzip_arf_report_path(:id => @arf_report.id), :class => "btn btn-default", :data => { :no_turbolink => true }),
   link_to(_("Download HTML"), download_html_arf_report_path(:id => @arf_report.id), :class => "btn btn-default", :data => { :no_turbolink => true })

data/app/views/smart_proxies/plugins/_openscap.html.erb

@@ -1,4 +1,3 @@
-<%= javascript 'foreman_openscap/openscap_proxy' %>
 <div class="row">
   <h3><%= feature %></h3>
 </div>

data/db/migrate/20200117135424_migrate_port_overrides_to_int.rb

@@ -10,7 +10,7 @@ class MigratePortOverridesToInt < ActiveRecord::Migration[5.2]
   private
 
   def transform_lookup_values(method)
-    return unless defined?(ForemanPuppet)
+    return unless Foreman::Plugin.installed?("foreman_puppet")
     puppet_class = ::ForemanPuppet::Puppetclass.find_by :name => 'foreman_scap_client'
     return unless puppet_class
     port_key = puppet_class.class_params.find_by :key => 'port'

data/db/migrate/20200803065041_migrate_port_overrides_for_ansible.rb

@@ -10,7 +10,7 @@ class MigratePortOverridesForAnsible < ActiveRecord::Migration[6.0]
   private
 
   def transform_lookup_values(method)
-    return unless defined?(ForemanAnsible)
+    return unless Foreman::Plugin.installed?("foreman_ansible")
     role = AnsibleRole.find_by :name => 'theforeman.foreman_scap_client'
     return unless role
     port_key = role.ansible_variables.find_by :key => 'foreman_scap_client_port'

data/db/migrate/20201202110213_update_puppet_port_param_type.rb

@@ -10,7 +10,7 @@ class UpdatePuppetPortParamType < ActiveRecord::Migration[6.0]
   private
 
   def update_port_type(method)
-    return unless defined?(ForemanPuppet)
+    return unless Foreman::Plugin.installed?("foreman_puppet")
     puppet_class = ::ForemanPuppet::Puppetclass.find_by :name => 'foreman_scap_client'
     return unless puppet_class
     port_key = puppet_class.class_params.find_by :key => 'port'

data/lib/foreman_openscap/engine.rb

@@ -1,6 +1,6 @@
 module ForemanOpenscap
   def self.with_katello?
-    defined?(::Katello)
+    Foreman::Plugin.installed?("katello")
   end
 
   class Engine < ::Rails::Engine

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "5.2.1".freeze
+  VERSION = "5.2.3".freeze
 end