foreman_openscap 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b0b56c6f69891762fa3bbcbd59f7de1883a2c3c
-  data.tar.gz: 9c3e7c7ce9fa65769ef3a8a46ca360e0efe2dae8
+  metadata.gz: caa574656df74e25c0475002df05b229193b872e
+  data.tar.gz: 307217d077f8f6ab73c167fa0a48105d12145d32
 SHA512:
-  metadata.gz: 4732cb483607a6d37de0ee738517d0e12ab3ab718f9fb43308f831a9f3cb19934667d5ba8fb434bd1244c929acf35e0890f5a24b9736c4d1fe22b09ff1fa8b65
-  data.tar.gz: 3e440693f385abe344f79b7b810c3b16d7603587268b3427566143dfed4b58867ea7500d2283aa520c29b4d2326d4d88a4f8a5a0849ef40948e964077374b69e
+  metadata.gz: 350cb9657d7ac2939208c7264076c08da48004345666085df5260246e60aa45817d05667a258825993e76bf1369670187f7a847dd2b156c447dbadd56a1c3bdd
+  data.tar.gz: 20fd5f82f889557c8c14df2b5afc1d8f79535ee9b2846ab13c549f7748a836260554f561e90ea5f61e69b00c132dc0d180bd8e81851f60878aec6ca71c3aea72

data/app/helpers/arf_reports_helper.rb

@@ -13,6 +13,19 @@ module ArfReportsHelper
     end
   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
+  end
+
   def result_tag(level)
     tag = case level
           when 'pass'

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

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

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

@@ -1,4 +1,7 @@
 <%= javascript 'foreman_openscap/load_report'%>
+
+<%= arf_report_breadcrumbs %>
+
 <div class="row">
   <div id="loading">
     <div class="col-md-4"></div>

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

@@ -1,2 +1,13 @@
 <% title _("Edit Compliance Policy") %>
+<%= breadcrumbs(:resource_url => api_compliance_policies_path,
+                :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)))
+                  }
+                ]
+              ) if @policy %>
+
 <%= render :partial => "form" %>

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

@@ -1,3 +1,15 @@
 <% title _("Edit SCAP Content") %>
+<%= 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 %>
+
 
 <%= render :partial => 'form' %>

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

@@ -1,3 +1,13 @@
 <% title _("Edit Tailoring File") %>
+<%= 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 %>
 
 <%= render :partial => 'form' %>

data/config/routes.rb

@@ -56,9 +56,9 @@ Rails.application.routes.draw do
     resources :hosts, :only => [:show], :as => :compliance_hosts, :controller => :compliance_hosts
   end
 
-  namespace :api do
+  namespace :api, :defaults => { :format => 'json' } do
     scope "(:apiv)", :module => :v2, :defaults => { :apiv => 'v2' },
-                     :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
+                     :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
       namespace :compliance do
         resources :scap_contents, :except => %i[new edit] do
           member do

data/lib/foreman_openscap/engine.rb

@@ -42,7 +42,7 @@ module ForemanOpenscap
 
     initializer 'foreman_openscap.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_openscap do
-        requires_foreman '>= 1.17'
+        requires_foreman '>= 1.18'
 
         apipie_documented_controllers ["#{ForemanOpenscap::Engine.root}/app/controllers/api/v2/compliance/*.rb"]
 

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.9.3".freeze
+  VERSION = "0.10.0".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - slukasik@redhat.com