foreman_openscap 0.10.1 → 0.10.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/arf_reports_controller.rb +1 -1
  3. data/app/views/foreman_openscap/policy_mailer/policy_summary.erb +1 -1
  4. data/db/seeds.d/75-job_templates.rb +6 -2
  5. data/lib/foreman_openscap/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 57a91e2bc0562de60ea4959460a9afe2029dddcc
4
- data.tar.gz: 5b1ed88b9b0d29381eccff2d5349c965b99c65d5
3
+ metadata.gz: 779fdbca1d48ffd319ebc5beb1228baa895f46c6
4
+ data.tar.gz: 5dc50eb81fb126fe7a37f5acf8d191e9793c6a77
5
5
  SHA512:
6
- metadata.gz: 199215c239ad13dd1e5ed6c971bd324f9dad62f138c5c0d42689dfa85050c71020514d247610e3c81d3acad4420927dc25d3e22cfe84355576b7067ecef914ab
7
- data.tar.gz: 51af4f9460056312001d0b7edec878a28adc6aba39876682f36825fe9decb9f206acaff598981958704699497d0aebb3282912d60dd8b6ea5f25f9499f79d770
6
+ metadata.gz: 2868f1d27bd4d4f05fa6d0fe1f9eb259e3390be31cc1dbd8811609e8095c1bffe7766478bf191ba7ac2050ab2471a3e63f6c0a737b934535b6519cb1cb977f7a
7
+ data.tar.gz: 570ced011de2aa3e8b068567d6893495a4eb2ae8b5afefd128d3d613b541a240d401d1e3c22001ee64bac621bcb1ca576f254a09bc32fc56aeebbfe0c8ab184a
data/app/controllers/arf_reports_controller.rb CHANGED
@@ -25,7 +25,7 @@ class ArfReportsController < ApplicationController
25
25
  begin
26
26
  self.response_body = @arf_report.to_html
27
27
  rescue => e
28
- render :text => _(e.message)
28
+ render :plain => _(e.message)
29
29
  end
30
30
  end
31
31
 
data/app/views/foreman_openscap/policy_mailer/policy_summary.erb CHANGED
@@ -3,7 +3,7 @@
3
3
  <html>
4
4
  <head>
5
5
  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
6
- <title> Summary report for OpenScap from Foreman </title>
6
+ <title><%= _("Summary report for OpenScap from Foreman") %></title>
7
7
  </head>
8
8
  <body style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; color: #3f3f3f; background-color: #f1f1f1; padding: 10px 24px">
9
9
  <h2 style="font-weight: normal; text-transform: uppercase; font-size: 120%;"><%= _("<b>Foreman</b> OpenSCAP summary").html_safe %></h2>
data/db/seeds.d/75-job_templates.rb CHANGED
@@ -1,3 +1,5 @@
1
+ organizations = Organization.unscoped.all
2
+ locations = Location.unscoped.all
1
3
  if ForemanOpenscap.with_remote_execution?
2
4
  User.as_anonymous_admin do
3
5
  JobTemplate.without_auditing do
@@ -5,10 +7,12 @@ if ForemanOpenscap.with_remote_execution?
5
7
  sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
6
8
  # import! was renamed to import_raw! around 1.3.1
7
9
  if JobTemplate.respond_to?('import_raw!')
8
- JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
10
+ template = JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
9
11
  else
10
- JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
12
+ template = JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
11
13
  end
14
+ template.organizations = organizations if SETTINGS[:organizations_enabled] && template.present?
15
+ template.locations = locations if SETTINGS[:locations_enabled] && template.present?
12
16
  end
13
17
  end
14
18
  end
data/lib/foreman_openscap/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForemanOpenscap
2
- VERSION = "0.10.1".freeze
2
+ VERSION = "0.10.2".freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_openscap
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.1
4
+ version: 0.10.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - slukasik@redhat.com
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-06-15 00:00:00.000000000 Z
11
+ date: 2018-07-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: deface