foreman_openscap 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cecea7c25a4175089ea99076020945bf8fad878
-  data.tar.gz: dc5e374d9ec51a449b9d753d61679416db110a76
+  metadata.gz: 541cd28ad75afe6563bcdcb9826e6418b6071c3e
+  data.tar.gz: dd618d8b18408d1f369a705f3722778b75a1d1ed
 SHA512:
-  metadata.gz: 556c68d4bb0a4bbb25c137bbf794cf44ff897a145453ba83b88790146e6e16cf51d76c33196d4b06bca4f2aab022f029a4d16ce4b7c2ae8f8d37b61e8a1edf08
-  data.tar.gz: fee367c23e8d58cf4b327ccbd363c2eba01f71f3a1de733a34f973d55527da2e4bced9ff6f3b6e87e3c567a49fe49f6251cc8531b183a6ace19bb401f853e60a
+  metadata.gz: f41d6c12b74959b58d7afe09c86f8f3c995a0532d7ad92889fd78d7c0f3b3b71ac9a55b2c116471f6852976bc5be9d6c7a219e093d8e7d279186ffa25970ed7e
+  data.tar.gz: 7613f7b7fa78403705f71ecf20d4d511b9788608cfd704583bf6f6c93664578feeafccd3fa011dc51c3973f2f1011f2e5bd2a0d2b512e930ad40187d75d679e6

data/app/controllers/api/v2/compliance/arf_reports_controller.rb

@@ -138,6 +138,12 @@ module Api
             super
           end
         end
+
+        protected
+
+        def assign_lone_taxonomies
+          # do not assign lone taxonomies to arf report
+        end
       end
     end
   end

data/app/controllers/api/v2/compliance/policies_controller.rb

@@ -3,6 +3,7 @@ module Api::V2
     class PoliciesController < ::Api::V2::BaseController
       include Foreman::Controller::SmartProxyAuth
       include Foreman::Controller::Parameters::PolicyApi
+      include ForemanOpenscap::Api::V2::ScapApiControllerExtensions
 
       add_smart_proxy_filters %i[content tailoring], :features => 'Openscap'
 
@@ -10,14 +11,6 @@ module Api::V2
 
       skip_after_action :log_response_body, :only => [:content]
 
-      def resource_name(resource = '::ForemanOpenscap::Policy')
-        super resource
-      end
-
-      def get_resource(message = 'no resource loaded')
-        instance_variable_get(:"@policy") || raise(message)
-      end
-
       def policy_url(policy = nil)
         api_compliance_policy_url(@policy)
       end

data/app/controllers/api/v2/compliance/scap_contents_controller.rb

@@ -3,15 +3,9 @@ module Api::V2
     class ScapContentsController < ::Api::V2::BaseController
       include Foreman::Controller::Parameters::ScapContent
       include ForemanOpenscap::BodyLogExtensions
-      before_action :find_resource, :except => %w[index create]
-
-      def resource_name(resource = '::ForemanOpenscap::ScapContent')
-        super resource
-      end
+      include ForemanOpenscap::Api::V2::ScapApiControllerExtensions
 
-      def get_resource(message = 'no resource loaded')
-        instance_variable_get(:"@scap_content") || raise(message)
-      end
+      before_action :find_resource, :except => %w[index create]
 
       api :GET, '/compliance/scap_contents', N_('List SCAP contents')
       param_group :search_and_pagination, ::Api::V2::BaseController

data/app/controllers/api/v2/compliance/tailoring_files_controller.rb

@@ -3,17 +3,11 @@ module Api::V2
     class TailoringFilesController < ::Api::V2::BaseController
       include Foreman::Controller::Parameters::TailoringFile
       include ForemanOpenscap::BodyLogExtensions
+      include ForemanOpenscap::Api::V2::ScapApiControllerExtensions
+
       before_action :find_resource, :except => %w[index create]
       before_action :openscap_proxy_check, :only => %w[create]
 
-      def resource_name(resource = '::ForemanOpenscap::TailoringFile')
-        super resource
-      end
-
-      def get_resource(message = 'no resource loaded')
-        instance_variable_get(:"@tailoring_file") || raise(message)
-      end
-
       api :GET, '/compliance/tailoring_files', N_('List Tailoring files')
       param_group :search_and_pagination, ::Api::V2::BaseController
       add_scoped_search_description_for(::ForemanOpenscap::TailoringFile)

data/app/controllers/concerns/foreman_openscap/api/v2/scap_api_controller_extensions.rb

@@ -0,0 +1,9 @@
+module ForemanOpenscap
+  module Api::V2::ScapApiControllerExtensions
+    extend ActiveSupport::Concern
+
+    def resource_class_for(resource)
+      super "foreman_openscap/#{resource}"
+    end
+  end
+end

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

@@ -51,7 +51,7 @@
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal"><%= _('Cancel') %></button>
-        <button type="button" class="btn btn-primary" onclick="submit_modal_form()"><%= _('Submit') %></button>
+        <button type="button" class="btn btn-primary" onclick="tfm.hosts.table.submitModalForm()"><%= _('Submit') %></button>
       </div>
     </div>
   </div>

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

@@ -4,5 +4,5 @@
              :url => update_multiple_openscap_proxy_hosts_path(:host_ids => params[:host_ids]) do |f| %>
     <%= selectable_f f, :id, [[_("Select OpenSCAP Proxy"), "None"],
                              ] + SmartProxy.with_features(['Openscap']).map{|e| [e.name, e.id]},{},
-                        :onchange => "toggle_multiple_ok_button(this)" %>
+                        :onchange => "tfm.hosts.table.toggleMultipleOkButton(this)" %>
 <% end %>

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

@@ -3,5 +3,5 @@
              :url => remove_policy_from_multiple_hosts_policies_path(:host_ids => params[:host_ids]) do |f| %>
     <%= selectable_f f, :id, [[_('Select Compliance Policy'), 'disabled'],
                              ] + ForemanOpenscap::Policy.all.map{|e| [e.name, e.id]},{},
-                        :onchange => 'toggle_multiple_ok_button(this)' %>
+                        :onchange => 'tfm.hosts.table.toggleMultipleOkButton(this)' %>
 <% end %>

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

@@ -4,5 +4,5 @@
              :url => update_multiple_hosts_policies_path(:host_ids => params[:host_ids]) do |f| %>
     <%= selectable_f f, :id, [[_("Select Compliance Policy"), "disabled"],
                              ] + ForemanOpenscap::Policy.all.map{|e| [e.name, e.id]},{},
-                        :onchange => "toggle_multiple_ok_button(this)" %>
+                        :onchange => "tfm.hosts.table.toggleMultipleOkButton(this)" %>
 <% end %>

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "2.0.1".freeze
+  VERSION = "2.0.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -56,6 +56,7 @@ files:
 - app/controllers/concerns/foreman/controller/parameters/scap_content.rb
 - app/controllers/concerns/foreman/controller/parameters/tailoring_file.rb
 - app/controllers/concerns/foreman_openscap/api/v2/hosts_controller_extensions.rb
+- app/controllers/concerns/foreman_openscap/api/v2/scap_api_controller_extensions.rb
 - app/controllers/concerns/foreman_openscap/arf_reports_controller_common_extensions.rb
 - app/controllers/concerns/foreman_openscap/body_log_extensions.rb
 - app/controllers/concerns/foreman_openscap/hosts_and_hostgroups_controller_extensions.rb
@@ -252,32 +253,45 @@ files:
 - locale/Makefile
 - locale/action_names.rb
 - locale/de/LC_MESSAGES/foreman_openscap.mo
+- locale/de/foreman_openscap.edit.po
 - locale/de/foreman_openscap.po
 - locale/en_GB/LC_MESSAGES/foreman_openscap.mo
+- locale/en_GB/foreman_openscap.edit.po
 - locale/en_GB/foreman_openscap.po
 - locale/es/LC_MESSAGES/foreman_openscap.mo
+- locale/es/foreman_openscap.edit.po
 - locale/es/foreman_openscap.po
 - locale/foreman_openscap.pot
 - locale/fr/LC_MESSAGES/foreman_openscap.mo
+- locale/fr/foreman_openscap.edit.po
 - locale/fr/foreman_openscap.po
 - locale/gl/LC_MESSAGES/foreman_openscap.mo
+- locale/gl/foreman_openscap.edit.po
 - locale/gl/foreman_openscap.po
 - locale/it/LC_MESSAGES/foreman_openscap.mo
+- locale/it/foreman_openscap.edit.po
 - locale/it/foreman_openscap.po
 - locale/ja/LC_MESSAGES/foreman_openscap.mo
+- locale/ja/foreman_openscap.edit.po
 - locale/ja/foreman_openscap.po
 - locale/ko/LC_MESSAGES/foreman_openscap.mo
+- locale/ko/foreman_openscap.edit.po
 - locale/ko/foreman_openscap.po
 - locale/pt_BR/LC_MESSAGES/foreman_openscap.mo
+- locale/pt_BR/foreman_openscap.edit.po
 - locale/pt_BR/foreman_openscap.po
 - locale/ru/LC_MESSAGES/foreman_openscap.mo
+- locale/ru/foreman_openscap.edit.po
 - locale/ru/foreman_openscap.po
 - locale/sv_SE/LC_MESSAGES/foreman_openscap.mo
+- locale/sv_SE/foreman_openscap.edit.po
 - locale/sv_SE/foreman_openscap.po
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/foreman_openscap.mo
+- locale/zh_CN/foreman_openscap.edit.po
 - locale/zh_CN/foreman_openscap.po
 - locale/zh_TW/LC_MESSAGES/foreman_openscap.mo
+- locale/zh_TW/foreman_openscap.edit.po
 - locale/zh_TW/foreman_openscap.po
 - test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb