foreman_openscap 11.1.1 → 12.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/foreman_openscap/locale/cs_CZ/foreman_openscap.js +1 -1
  3. data/app/assets/javascripts/foreman_openscap/locale/de/foreman_openscap.js +1 -1
  4. data/app/assets/javascripts/foreman_openscap/locale/en/foreman_openscap.js +1 -1
  5. data/app/assets/javascripts/foreman_openscap/locale/en_GB/foreman_openscap.js +1 -1
  6. data/app/assets/javascripts/foreman_openscap/locale/es/foreman_openscap.js +1 -1
  7. data/app/assets/javascripts/foreman_openscap/locale/fr/foreman_openscap.js +1 -1
  8. data/app/assets/javascripts/foreman_openscap/locale/gl/foreman_openscap.js +1 -1
  9. data/app/assets/javascripts/foreman_openscap/locale/it/foreman_openscap.js +1 -1
  10. data/app/assets/javascripts/foreman_openscap/locale/ja/foreman_openscap.js +1 -1
  11. data/app/assets/javascripts/foreman_openscap/locale/ka/foreman_openscap.js +1 -1
  12. data/app/assets/javascripts/foreman_openscap/locale/ko/foreman_openscap.js +1 -1
  13. data/app/assets/javascripts/foreman_openscap/locale/pt_BR/foreman_openscap.js +1 -1
  14. data/app/assets/javascripts/foreman_openscap/locale/ru/foreman_openscap.js +1 -1
  15. data/app/assets/javascripts/foreman_openscap/locale/sv_SE/foreman_openscap.js +1 -1
  16. data/app/assets/javascripts/foreman_openscap/locale/zh_CN/foreman_openscap.js +1 -1
  17. data/app/assets/javascripts/foreman_openscap/locale/zh_TW/foreman_openscap.js +1 -1
  18. data/app/controllers/arf_reports_controller.rb +1 -2
  19. data/app/models/foreman_openscap/arf_report.rb +3 -0
  20. data/lib/foreman_openscap/engine.rb +1 -1
  21. data/lib/foreman_openscap/version.rb +1 -1
  22. data/locale/cs_CZ/LC_MESSAGES/foreman_openscap.mo +0 -0
  23. data/locale/cs_CZ/foreman_openscap.po +1 -1
  24. data/locale/de/LC_MESSAGES/foreman_openscap.mo +0 -0
  25. data/locale/de/foreman_openscap.po +1 -1
  26. data/locale/en/LC_MESSAGES/foreman_openscap.mo +0 -0
  27. data/locale/en/foreman_openscap.po +1 -1
  28. data/locale/en_GB/LC_MESSAGES/foreman_openscap.mo +0 -0
  29. data/locale/en_GB/foreman_openscap.po +1 -1
  30. data/locale/es/LC_MESSAGES/foreman_openscap.mo +0 -0
  31. data/locale/es/foreman_openscap.po +1 -1
  32. data/locale/foreman_openscap.pot +11 -11
  33. data/locale/fr/LC_MESSAGES/foreman_openscap.mo +0 -0
  34. data/locale/fr/foreman_openscap.po +1 -1
  35. data/locale/gl/LC_MESSAGES/foreman_openscap.mo +0 -0
  36. data/locale/gl/foreman_openscap.po +1 -1
  37. data/locale/it/LC_MESSAGES/foreman_openscap.mo +0 -0
  38. data/locale/it/foreman_openscap.po +1 -1
  39. data/locale/ja/LC_MESSAGES/foreman_openscap.mo +0 -0
  40. data/locale/ja/foreman_openscap.po +1 -1
  41. data/locale/ka/LC_MESSAGES/foreman_openscap.mo +0 -0
  42. data/locale/ka/foreman_openscap.po +1 -1
  43. data/locale/ko/LC_MESSAGES/foreman_openscap.mo +0 -0
  44. data/locale/ko/foreman_openscap.po +1 -1
  45. data/locale/pt_BR/LC_MESSAGES/foreman_openscap.mo +0 -0
  46. data/locale/pt_BR/foreman_openscap.po +1 -1
  47. data/locale/ru/LC_MESSAGES/foreman_openscap.mo +0 -0
  48. data/locale/ru/foreman_openscap.po +1 -1
  49. data/locale/sv_SE/LC_MESSAGES/foreman_openscap.mo +0 -0
  50. data/locale/sv_SE/foreman_openscap.po +1 -1
  51. data/locale/zh_CN/LC_MESSAGES/foreman_openscap.mo +0 -0
  52. data/locale/zh_CN/foreman_openscap.po +1 -1
  53. data/locale/zh_TW/LC_MESSAGES/foreman_openscap.mo +0 -0
  54. data/locale/zh_TW/foreman_openscap.po +1 -1
  55. data/test/functional/api/v2/compliance/arf_reports_controller_test.rb +24 -0
  56. data/test/functional/arf_reports_controller_test.rb +9 -0
  57. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 5134096644a9dbb466a863dfcc7530deb271322247877564b4b0edf050072447
4
- data.tar.gz: 8cc55bf6e8f477c36bbb48c98df06e58ac2619e65c6f0ced61eef1d5582d774f
3
+ metadata.gz: afee8d8fb86be90f1ad203d30b24b97a9912f4b0b72746679af0cddcb98eaee8
4
+ data.tar.gz: 37f9e1a5864bf34a1891b9395b12bc233073e75b2e946bd6eb35db60aeaa32a5
5
5
  SHA512:
6
- metadata.gz: '08b459527dfa059b50ccdb60ffc2cd6ecd983afb778d9b5d5ceb77fb0b415301d0794053865ad0bca41d9476f5895da71c56dc1165183ec738159080f9c83398'
7
- data.tar.gz: 9eab3b0a20193b070b4f41cc0f998ece12ce2ab0a8f7cf616c7367794d6fb48d931d1b0c83316742c5cc49f1b2ac997dc8f1c20796dbcbb59fcb7126c6f64924
6
+ metadata.gz: 061e846c8486920ef45900caaab115dc7b9b1e6414abaf53a271013e8b2e3c91bc3efc1ee02616b8a14ce58d07ab90f7a0a49e8f44317ec6e724ddb2f511cc68
7
+ data.tar.gz: 114447087d697e43a382e3fd774278c264d086d18d325649a0f334f8987d1d4b06710b938fc109fdbfb70b6bf5fb994d61d8f0633e6070d4a24201d457e290fd
data/app/assets/javascripts/foreman_openscap/locale/cs_CZ/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "Pavel Borecki <pavel.borecki@gmail.com>, 2018-2020",
data/app/assets/javascripts/foreman_openscap/locale/de/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "pdolinic, 2021",
data/app/assets/javascripts/foreman_openscap/locale/en/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2023-05-16 14:11+0200",
9
9
  "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
data/app/assets/javascripts/foreman_openscap/locale/en_GB/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
data/app/assets/javascripts/foreman_openscap/locale/es/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
data/app/assets/javascripts/foreman_openscap/locale/fr/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2016",
data/app/assets/javascripts/foreman_openscap/locale/gl/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
data/app/assets/javascripts/foreman_openscap/locale/it/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
data/app/assets/javascripts/foreman_openscap/locale/ja/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "Kazuki Omo <kazuki.omo@gmail.com>, 2016",
data/app/assets/javascripts/foreman_openscap/locale/ka/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
data/app/assets/javascripts/foreman_openscap/locale/ko/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
data/app/assets/javascripts/foreman_openscap/locale/pt_BR/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
data/app/assets/javascripts/foreman_openscap/locale/ru/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
data/app/assets/javascripts/foreman_openscap/locale/sv_SE/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "FULL NAME <EMAIL@ADDRESS>",
data/app/assets/javascripts/foreman_openscap/locale/zh_CN/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
data/app/assets/javascripts/foreman_openscap/locale/zh_TW/foreman_openscap.js CHANGED
@@ -3,7 +3,7 @@
3
3
  "locale_data": {
4
4
  "foreman_openscap": {
5
5
  "": {
6
- "Project-Id-Version": "foreman_openscap 11.1.1",
6
+ "Project-Id-Version": "foreman_openscap 12.0.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "FIRST AUTHOR <EMAIL@ADDRESS>, 2016",
data/app/controllers/arf_reports_controller.rb CHANGED
@@ -13,8 +13,7 @@ class ArfReportsController < ApplicationController
13
13
  # Avoid using includes() with nested associations and "order by" together. Otherwise,
14
14
  # includes() will use join tables instead and Rails somehow create many objects and
15
15
  # high memory consumption.
16
- @arf_reports_pg = resource_base.search_for(params[:search], :order => params[:order])
17
- .paginate(:page => params[:page], :per_page => params[:per_page])
16
+ @arf_reports_pg = resource_base_search_and_page.load
18
17
  arf_report_ids = @arf_reports_pg.pluck(:id)
19
18
  @arf_reports = resource_base.includes(:policy, :openscap_proxy, :host => %i[policies last_report_object host_statuses])
20
19
  .where(id: arf_report_ids)
data/app/models/foreman_openscap/arf_report.rb CHANGED
@@ -53,11 +53,14 @@ module ForemanOpenscap
53
53
 
54
54
  scope :failed, lambda { where("(#{report_status_column} >> #{bit_mask 'failed'}) > 0") }
55
55
  scope :not_failed, lambda { where("(#{report_status_column} >> #{bit_mask 'failed'}) = 0") }
56
+ virtual_column_scope :select_compliance_failed, lambda { select("reports.*, (#{report_status_column} >> #{bit_mask 'failed'}) as compliance_failed") }
56
57
 
57
58
  scope :othered, lambda { where("(#{report_status_column} >> #{bit_mask 'othered'}) > 0").merge(not_failed) }
58
59
  scope :not_othered, lambda { where("(#{report_status_column} >> #{bit_mask 'othered'}) = 0") }
60
+ virtual_column_scope :select_compliance_othered, lambda { select("reports.*, (#{report_status_column} >> #{bit_mask 'othered'}) as compliance_othered") }
59
61
 
60
62
  scope :passed, lambda { where("(#{report_status_column} >> #{bit_mask 'passed'}) > 0").merge(not_failed).merge(not_othered) }
63
+ virtual_column_scope :select_compliance_passed, lambda { select("reports.*, (#{report_status_column} >> #{bit_mask 'passed'}) as compliance_passed") }
61
64
 
62
65
  scope :by_rule_result, lambda { |rule_name, rule_result| joins(:sources).where(:sources => { :value => rule_name }, :logs => { :result => rule_result }) }
63
66
 
data/lib/foreman_openscap/engine.rb CHANGED
@@ -40,7 +40,7 @@ module ForemanOpenscap
40
40
  initializer 'foreman_openscap.register_plugin', :before => :finisher_hook do |app|
41
41
  app.reloader.to_prepare do
42
42
  Foreman::Plugin.register :foreman_openscap do
43
- requires_foreman '>= 3.16'
43
+ requires_foreman '>= 3.17'
44
44
  register_gettext
45
45
 
46
46
  apipie_documented_controllers ["#{ForemanOpenscap::Engine.root}/app/controllers/api/v2/compliance/*.rb"]
data/lib/foreman_openscap/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForemanOpenscap
2
- VERSION = "11.1.1".freeze
2
+ VERSION = "12.0.1".freeze
3
3
  end
data/locale/cs_CZ/foreman_openscap.po CHANGED
@@ -6,7 +6,7 @@
6
6
  # Pavel Borecki <pavel.borecki@gmail.com>, 2018-2020
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: foreman_openscap 11.1.1\n"
9
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
11
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
12
12
  "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>, 2018-2020\n"
data/locale/de/foreman_openscap.po CHANGED
@@ -10,7 +10,7 @@
10
10
  # pdolinic, 2021
11
11
  msgid ""
12
12
  msgstr ""
13
- "Project-Id-Version: foreman_openscap 11.1.1\n"
13
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
14
14
  "Report-Msgid-Bugs-To: \n"
15
15
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
16
16
  "Last-Translator: pdolinic, 2021\n"
data/locale/en/foreman_openscap.po CHANGED
@@ -5,7 +5,7 @@
5
5
  #
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: foreman_openscap 11.1.1\n"
8
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
10
  "PO-Revision-Date: 2023-05-16 14:11+0200\n"
11
11
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
data/locale/en_GB/foreman_openscap.po CHANGED
@@ -5,7 +5,7 @@
5
5
  # Translators:
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: foreman_openscap 11.1.1\n"
8
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
10
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
11
11
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
data/locale/es/foreman_openscap.po CHANGED
@@ -7,7 +7,7 @@
7
7
  # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
8
8
  msgid ""
9
9
  msgstr ""
10
- "Project-Id-Version: foreman_openscap 11.1.1\n"
10
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
11
11
  "Report-Msgid-Bugs-To: \n"
12
12
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
13
13
  "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"
data/locale/foreman_openscap.pot CHANGED
@@ -8,8 +8,8 @@ msgid ""
8
8
  msgstr ""
9
9
  "Project-Id-Version: foreman_openscap 1.0.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
- "POT-Creation-Date: 2025-10-08 12:41+0000\n"
12
- "PO-Revision-Date: 2025-10-08 12:41+0000\n"
11
+ "POT-Creation-Date: 2025-10-08 11:04+0000\n"
12
+ "PO-Revision-Date: 2025-10-08 11:04+0000\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -239,39 +239,39 @@ msgstr ""
239
239
  msgid "Deletes a Tailoring file"
240
240
  msgstr ""
241
241
 
242
- #: ../app/controllers/arf_reports_controller.rb:43
242
+ #: ../app/controllers/arf_reports_controller.rb:42
243
243
  msgid "Failed to downloaded ARF report as bzip: %s"
244
244
  msgstr ""
245
245
 
246
- #: ../app/controllers/arf_reports_controller.rb:54
246
+ #: ../app/controllers/arf_reports_controller.rb:53
247
247
  msgid "Failed to downloaded ARF report in HTML: %s"
248
248
  msgstr ""
249
249
 
250
- #: ../app/controllers/arf_reports_controller.rb:61
250
+ #: ../app/controllers/arf_reports_controller.rb:60
251
251
  msgid "Successfully deleted ARF report."
252
252
  msgstr ""
253
253
 
254
- #: ../app/controllers/arf_reports_controller.rb:63
254
+ #: ../app/controllers/arf_reports_controller.rb:62
255
255
  msgid "Failed to delete ARF Report for host %{host_name} reported at %{reported_at}"
256
256
  msgstr ""
257
257
 
258
- #: ../app/controllers/arf_reports_controller.rb:73
258
+ #: ../app/controllers/arf_reports_controller.rb:72
259
259
  msgid "Failed to delete %s compliance reports"
260
260
  msgstr ""
261
261
 
262
- #: ../app/controllers/arf_reports_controller.rb:76
262
+ #: ../app/controllers/arf_reports_controller.rb:75
263
263
  msgid "Successfully deleted %s compliance reports"
264
264
  msgstr ""
265
265
 
266
- #: ../app/controllers/arf_reports_controller.rb:112
266
+ #: ../app/controllers/arf_reports_controller.rb:111
267
267
  msgid "No compliance reports were found."
268
268
  msgstr ""
269
269
 
270
- #: ../app/controllers/arf_reports_controller.rb:116
270
+ #: ../app/controllers/arf_reports_controller.rb:115
271
271
  msgid "No compliance reports selected"
272
272
  msgstr ""
273
273
 
274
- #: ../app/controllers/arf_reports_controller.rb:121
274
+ #: ../app/controllers/arf_reports_controller.rb:120
275
275
  msgid "Something went wrong while selecting compliance reports - %s"
276
276
  msgstr ""
277
277
 
data/locale/fr/foreman_openscap.po CHANGED
@@ -8,7 +8,7 @@
8
8
  # Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2016
9
9
  msgid ""
10
10
  msgstr ""
11
- "Project-Id-Version: foreman_openscap 11.1.1\n"
11
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
12
12
  "Report-Msgid-Bugs-To: \n"
13
13
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
14
14
  "Last-Translator: Pierre-Emmanuel Dutang <dutangp@gmail.com>, 2016\n"
data/locale/gl/foreman_openscap.po CHANGED
@@ -5,7 +5,7 @@
5
5
  # Translators:
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: foreman_openscap 11.1.1\n"
8
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
10
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
11
11
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
data/locale/it/foreman_openscap.po CHANGED
@@ -6,7 +6,7 @@
6
6
  # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: foreman_openscap 11.1.1\n"
9
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
11
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
12
12
  "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"
data/locale/ja/foreman_openscap.po CHANGED
@@ -7,7 +7,7 @@
7
7
  # Kazuki Omo <kazuki.omo@gmail.com>, 2016
8
8
  msgid ""
9
9
  msgstr ""
10
- "Project-Id-Version: foreman_openscap 11.1.1\n"
10
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
11
11
  "Report-Msgid-Bugs-To: \n"
12
12
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
13
13
  "Last-Translator: Kazuki Omo <kazuki.omo@gmail.com>, 2016\n"
data/locale/ka/foreman_openscap.po CHANGED
@@ -5,7 +5,7 @@
5
5
  # Translators:
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: foreman_openscap 11.1.1\n"
8
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
10
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
11
11
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
data/locale/ko/foreman_openscap.po CHANGED
@@ -7,7 +7,7 @@
7
7
  # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
8
8
  msgid ""
9
9
  msgstr ""
10
- "Project-Id-Version: foreman_openscap 11.1.1\n"
10
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
11
11
  "Report-Msgid-Bugs-To: \n"
12
12
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
13
13
  "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"
data/locale/pt_BR/foreman_openscap.po CHANGED
@@ -6,7 +6,7 @@
6
6
  # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: foreman_openscap 11.1.1\n"
9
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
11
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
12
12
  "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"
data/locale/ru/foreman_openscap.po CHANGED
@@ -7,7 +7,7 @@
7
7
  # Yulia <yulia.poyarkova@redhat.com>, 2016
8
8
  msgid ""
9
9
  msgstr ""
10
- "Project-Id-Version: foreman_openscap 11.1.1\n"
10
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
11
11
  "Report-Msgid-Bugs-To: \n"
12
12
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
13
13
  "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"
data/locale/sv_SE/foreman_openscap.po CHANGED
@@ -5,7 +5,7 @@
5
5
  # Translators:
6
6
  msgid ""
7
7
  msgstr ""
8
- "Project-Id-Version: foreman_openscap 11.1.1\n"
8
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
9
9
  "Report-Msgid-Bugs-To: \n"
10
10
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
11
11
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
data/locale/zh_CN/foreman_openscap.po CHANGED
@@ -6,7 +6,7 @@
6
6
  # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: foreman_openscap 11.1.1\n"
9
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
11
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
12
12
  "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"
data/locale/zh_TW/foreman_openscap.po CHANGED
@@ -6,7 +6,7 @@
6
6
  # FIRST AUTHOR <EMAIL@ADDRESS>, 2016
7
7
  msgid ""
8
8
  msgstr ""
9
- "Project-Id-Version: foreman_openscap 11.1.1\n"
9
+ "Project-Id-Version: foreman_openscap 12.0.0\n"
10
10
  "Report-Msgid-Bugs-To: \n"
11
11
  "PO-Revision-Date: 2016-04-14 07:48+0000\n"
12
12
  "Last-Translator: FIRST AUTHOR <EMAIL@ADDRESS>, 2016\n"
data/test/functional/api/v2/compliance/arf_reports_controller_test.rb CHANGED
@@ -436,6 +436,30 @@ class Api::V2::Compliance::ArfReportsControllerTest < ActionController::TestCase
436
436
  assert_equal report.id, response['results'].first["id"].to_i
437
437
  end
438
438
 
439
+ test "should order by compliance_[failed|passed|othered]" do
440
+ reports_cleanup
441
+ policy = FactoryBot.create(:policy)
442
+ create_arf_report_for_search({ "passed" => 4, "othered" => 0, "failed" => 1 }, policy)
443
+ create_arf_report_for_search({ "passed" => 1, "othered" => 0, "failed" => 0 }, policy)
444
+ create_arf_report_for_search({ "passed" => 15, "othered" => 9, "failed" => 0 }, policy)
445
+ create_arf_report_for_search({ "passed" => 2, "othered" => 3, "failed" => 7 }, policy)
446
+
447
+ get :index, :params => { :order => "compliance_failed DESC" }, :session => set_session_user
448
+ assert_response :success
449
+ response = ActiveSupport::JSON.decode(@response.body)
450
+ assert_equal 7, response['results'].first['failed']
451
+
452
+ get :index, :params => { :order => "compliance_passed DESC" }, :session => set_session_user
453
+ assert_response :success
454
+ response = ActiveSupport::JSON.decode(@response.body)
455
+ assert_equal 15, response['results'].first['passed']
456
+
457
+ get :index, :params => { :order => "compliance_othered DESC" }, :session => set_session_user
458
+ assert_response :success
459
+ response = ActiveSupport::JSON.decode(@response.body)
460
+ assert_equal 9, response['results'].first['othered']
461
+ end
462
+
439
463
  private
440
464
 
441
465
  def reports_cleanup
data/test/functional/arf_reports_controller_test.rb CHANGED
@@ -37,4 +37,13 @@ class ArfReportsControllerTest < ActionController::TestCase
37
37
  get :download_html, :params => { :id => arf_report.id }, :session => set_session_user
38
38
  assert_equal report_html, @response.body
39
39
  end
40
+
41
+ test "should order arf reports by compliance_[failed|passed|othered]" do
42
+ get :index, params: { order: "compliance_failed DESC" }, :session => set_session_user
43
+ assert_response :success
44
+ get :index, params: { order: "compliance_passed DESC" }, :session => set_session_user
45
+ assert_response :success
46
+ get :index, params: { order: "compliance_othered DESC" }, :session => set_session_user
47
+ assert_response :success
48
+ end
40
49
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_openscap
3
3
  version: !ruby/object:Gem::Version
4
- version: 11.1.1
4
+ version: 12.0.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - slukasik@redhat.com