foreman_openscap 4.1.3 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65c54fcbd65a0adcb3f9b4de1a910347846e0bde26474badf13af2b41b46774f
-  data.tar.gz: bfed9e4eb472d42bace5aa31d6eba2b2e3beb20fa28518b9dc20df73c9413b0c
+  metadata.gz: 69eab4d9434f1b502ba511db38d8a7faff9721c5416703f6010ccc87fdc52b86
+  data.tar.gz: 94ba4cbecc85106f968d9b5f137e0808dbd12711db01fd14e0f0c4e9761e27a1
 SHA512:
-  metadata.gz: 5976ff19ccb147ff0a677ed3d61a219ae8e8aeac6c2526d48b57de37f3cbc83b425817365a2ede1be36813c0f9aa0ebc1d73636deb9b350f799b04d2581a7337
-  data.tar.gz: a5ad35a6f95d9f992f99f7fbf6f44c33c3a9c9d769dc1b8d871d0806b91b92f78b084231c87af15680ab760ebc931bf5027af28538a047e99fffd075839379c0
+  metadata.gz: 4e3253f876e3ab4efd5c853fdb05f0b81cbbe7184c5b00ea552690b0cce9664a76210c32f92fe86c631bc9eaa2ed81ba1a8762b8b47e0678149a946cf593554e
+  data.tar.gz: a6c3706f6fcc836af18f7aeda76c1cf735981836a0661cdcc66e4ead2272b6249519f305ff3b6766266ebb05eda1ebfe778811993286be3e162e269412aa6fd8

data/app/assets/stylesheets/foreman_openscap/policy.css

@@ -6,3 +6,8 @@
   display: none;
 }
 
+span.scap_policy_popover {
+  float: left;
+  margin-top: 2px;
+}
+

data/app/helpers/arf_reports_helper.rb

@@ -14,16 +14,13 @@ module ArfReportsHelper
   end
 
   def arf_report_breadcrumbs
-    if @arf_report && @arf_report.host
-      breadcrumbs(:resource_url => api_compliance_arf_reports_path,
-                  :switchable => false,
-                  :items => [
-                    { :caption => _('Compliance Reports'),
-                      :url => url_for(arf_reports_path) },
-                    { :caption => @arf_report.host.name,
-                      :url => (arf_report_path(@arf_report) if authorized_for(hash_for_arf_report_path(@arf_report))) }
-                  ])
-    end
+    breadcrumbs(:resource_url => api_compliance_arf_reports_path,
+                :switchable => false,
+                :items => [
+                  { :caption => _('Compliance Reports'),
+                    :url => url_for(arf_reports_path) },
+                  { :caption => @arf_report.host.to_s }
+                ])
   end
 
   def result_tag(level)

data/app/helpers/policies_helper.rb

@@ -11,10 +11,10 @@ module PoliciesHelper
 
   def deploy_by_radios(f, policy)
     ForemanOpenscap::ConfigNameService.new.configs.map do |tool|
-      popover_block = popover("", config_inline_help(tool.inline_help))
+      popover_block = tag.span(popover("", config_inline_help(tool.inline_help)), class: 'scap_policy_popover')
 
-      label = label_tag('', :class => 'col-md-2 control-label') do
-        tool.type.to_s.capitalize.html_safe + ' ' + popover_block.html_safe
+      label = label_tag('', :class => 'col-md-2 control-label', :for => "policy_deploy_by_#{tool.type}") do
+        tool.type.to_s.capitalize.html_safe
       end
 
       radio = content_tag(:div, :class => "col-md-2") do
@@ -23,7 +23,7 @@ module PoliciesHelper
 
       content_tag(:div, :class => "clearfix") do
         content_tag(:div, :class => "form-group") do
-          label.html_safe + radio.html_safe
+          label.html_safe + popover_block.html_safe + radio.html_safe
         end
       end
     end.join('').html_safe
@@ -136,17 +136,4 @@ module PoliciesHelper
   def translate_steps(policy)
     policy.steps.map { |step| _(step) }
   end
-
-  def policy_breadcrumbs
-    if @policy
-      breadcrumbs(:resource_url => api_compliance_policies_path,
-                  :name_field => 'name',
-                  :items => [
-                    { :caption => _('Policies'),
-                      :url => url_for(policies_path) },
-                    { :caption => @policy.name,
-                      :url => (edit_policy_path(@policy) if authorized_for(hash_for_edit_policy_path(@policy))) }
-                  ])
-    end
-  end
 end

data/app/models/foreman_openscap/arf_report.rb

@@ -156,8 +156,8 @@ module ForemanOpenscap
 
     def assign_locations_organizations
       if host
-        self.location_ids = [host.location_id] if SETTINGS[:locations_enabled]
-        self.organization_ids = [host.organization_id] if SETTINGS[:organizations_enabled]
+        self.location_ids = [host.location_id]
+        self.organization_ids = [host.organization_id]
       end
     end
 

data/app/models/foreman_openscap/policy.rb

@@ -6,6 +6,8 @@ module ForemanOpenscap
     include Taxonomix
     attr_writer :current_step, :wizard_initiated
 
+    STEPS_LIST = [N_('Deployment Options'), N_('Policy Attributes'), N_('SCAP Content'), N_('Schedule'), N_('Locations'), N_('Organizations'), N_('Hostgroups')]
+
     belongs_to :scap_content
     belongs_to :scap_content_profile
     belongs_to :tailoring_file
@@ -108,10 +110,7 @@ module ForemanOpenscap
     end
 
     def steps
-      base_steps = [N_('Deployment Options'), N_('Policy Attributes'), N_('SCAP Content'), N_('Schedule')]
-      base_steps << N_('Locations') if SETTINGS[:locations_enabled]
-      base_steps << N_('Organizations') if SETTINGS[:organizations_enabled]
-      base_steps << N_('Hostgroups') # always be last.
+      STEPS_LIST
     end
 
     def current_step

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

@@ -2,7 +2,7 @@
 <% javascript 'foreman_openscap/reports' %>
 <% stylesheet 'foreman_openscap/reports' %>
 
-<% title "#{@arf_report.host}" %>
+<% title @arf_report.host.to_s %>
 <%= arf_report_breadcrumbs %>
 
 <p class='ra'><%= reported_info @arf_report %></p>

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

@@ -1,5 +1,6 @@
 <%= javascript 'foreman_openscap/load_report'%>
 
+<% title @arf_report.host.to_s %>
 <%= arf_report_breadcrumbs %>
 
 <div class="row">

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

@@ -3,14 +3,7 @@
 
 <%= breadcrumbs(:resource_url => api_hosts_path,
                 :resource_filter => "is_compliance_host = true",
-                :name_field => 'name',
-                :switchable => true,
-                :items => [
-                  { :caption => _('Compliance Hosts'),
-                    :url => url_for(hosts_path(:search => "is_compliance_host = true")) },
-                  { :caption => ((N_("%s compliance reports by policy") % @host.to_label)),
-                    :url => (host_path(@host) if authorized_for(hash_for_host_path(@host))) }
-                ])
+                :name_field => 'name')
 %>
 <% title n_("%s compliance report by policy", "%s compliance reports by policy" , @host.combined_policies.length) % @host.to_label %>
 <% @host.combined_policies.each do |policy| %>

data/app/views/policies/edit.html.erb

@@ -1,4 +1,5 @@
-<% title _("Edit Compliance Policy") %>
-<%= policy_breadcrumbs %>
+<% title _("Edit %s") % @policy.name %>
+<%= breadcrumbs(:resource_url => api_compliance_policies_path,
+                :name_field => 'name') %>
 
 <%= render :partial => "form" %>

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

@@ -1,4 +1,6 @@
-<%= policy_breadcrumbs %>
+<% title _("Details for Compliance Policy %s") % @policy.name %>
+<%= breadcrumbs(:resource_url => api_compliance_policies_path,
+                  :name_field => 'name') %>
 
 <div class="row">
   <iframe style="min-height: 800px" height="100%" width="100%" frameborder="0" src="<%= parse_policy_path(@policy) %>"></iframe>

data/app/views/scap_contents/edit.html.erb

@@ -1,15 +1,5 @@
-<% title _("Edit SCAP Content") %>
+<% title _("Edit %s") % @scap_content.title %>
 <%= breadcrumbs(:resource_url => api_compliance_scap_contents_path,
-                :name_field => 'title',
-                :items => [
-                  { :caption => _('Scap Contents'),
-                    :url => url_for(scap_contents_path)
-                  },
-                  { :caption => @scap_content.title,
-                    :url => (edit_scap_content_path(@scap_content) if authorized_for(hash_for_edit_scap_content_path(@scap_content)))
-                  }
-                ]
-              ) if @scap_content %>
-
+                :name_field => 'title') %>
 
 <%= render :partial => 'form' %>

data/app/views/tailoring_files/edit.html.erb

@@ -1,13 +1,5 @@
-<% title _("Edit Tailoring File") %>
+<% title _("Edit %s") % @tailoring_file.name %>
 <%= breadcrumbs(:resource_url => api_compliance_tailoring_files_path,
-                :items => [
-                  { :caption => _('Tailoring Files'),
-                    :url => url_for(tailoring_files_path)
-                  },
-                  { :caption => @tailoring_file.name,
-                    :url => (edit_tailoring_file_path(@tailoring_file) if authorized_for(hash_for_edit_tailoring_file_path(@tailoring_file)))
-                  }
-                ]
-              ) if @tailoring_file %>
+                :name_field => 'name') %>
 
 <%= render :partial => 'form' %>

data/db/migrate/20201202110213_update_puppet_port_param_type.rb

@@ -14,11 +14,15 @@ class UpdatePuppetPortParamType < ActiveRecord::Migration[6.0]
     return unless puppet_class
     port_key = puppet_class.class_params.find_by :key => 'port'
     return unless port_key
+    def_value = port_key.default_value
 
     if method == :to_i
-      port_key.update_columns(:key_type => "integer", :default_value => port_key.default_value.to_i)
+      port_key.key_type =  "integer"
+      port_key.default_value = def_value.to_i
     else
-      port_key.update_columns(:key_type => "string", :default_value => port_key.default_value.to_s)
+      port_key.key_type == "string"
+      port_key.default_value = port_key.default_value.to_s
     end
+    port_key.save!
   end
 end

data/db/seeds.d/75-job_templates.rb

@@ -11,8 +11,9 @@ if ForemanOpenscap.with_remote_execution?
         else
           template = JobTemplate.import!(File.read(template), :default => true, :lock => true, :update => sync)
         end
-        template.organizations = organizations if SETTINGS[:organizations_enabled] && template.present?
-        template.locations = locations if SETTINGS[:locations_enabled] && template.present?
+        next unless template.present?
+        template.organizations = organizations
+        template.locations = locations
       end
     end
   end

data/lib/foreman_openscap/bulk_upload.rb

@@ -49,8 +49,8 @@ module ForemanOpenscap
         next if scap_content.persisted?
         scap_content.scap_file = file
         scap_content.original_filename = filename
-        scap_content.location_ids = Location.all.map(&:id)
-        scap_content.organization_ids = Organization.all.map(&:id)
+        scap_content.location_ids = Location.all.pluck(:id)
+        scap_content.organization_ids = Organization.all.pluck(:id)
 
         if scap_content.save
           @result.results.push(scap_content)

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "4.1.3".freeze
+  VERSION = "4.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.2.0
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake