Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tests #516

Merged
merged 1 commit into from Nov 25, 2021
Merged

Fix tests #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/models/concerns/foreman_openscap/data_stream_content.rb
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ module DataStreamContent
validates_with ForemanOpenscap::DataStreamValidator

after_save :create_profiles, :if => lambda { |ds_content| ds_content.scap_file_previously_changed? }
before_destroy ActiveRecord::Base::EnsureNotUsedBy.new(:policies)
before_destroy EnsureNotUsedBy.new(:policies)
end

def proxy_url
Expand Down
2 changes: 1 addition & 1 deletion app/models/foreman_openscap/oval_content.rb
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ class OvalContent < ApplicationRecord
include Taxonomix
include ScapFileContent

before_destroy ActiveRecord::Base::EnsureNotUsedBy.new(:oval_policies)
before_destroy EnsureNotUsedBy.new(:oval_policies)

scoped_search :on => :name, :complete_value => true

Expand Down
4 changes: 2 additions & 2 deletions lib/foreman_openscap/engine.rb
View file
Open in desktop
Expand Up @@ -191,8 +191,8 @@ class Engine < ::Rails::Engine
"dashboard link hosts with no reports", "dashboard link hosts with alerts disabled",
"widgets not in dashboard show up in list"] })
# strong params
parameter_filter Host::Managed, :openscap_proxy_id, :openscap_proxy
parameter_filter Hostgroup, :openscap_proxy_id, :openscap_proxy
parameter_filter ::Host::Managed, :openscap_proxy_id, :openscap_proxy
parameter_filter ::Hostgroup, :openscap_proxy_id, :openscap_proxy
parameter_filter Log, :result

proxy_description = N_('OpenSCAP Proxy to use for fetching SCAP content and uploading ARF reports. Leave blank and override appropriate parameters when using proxy load balancer.')
Expand Down