foreman_openscap 11.1.1 → 12.0.0

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 +2 -2
  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 +3 -3
  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 +2 -2
  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 +2 -2
  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 +2 -2
  33. data/locale/fr/LC_MESSAGES/foreman_openscap.mo +0 -0
  34. data/locale/fr/foreman_openscap.po +2 -2
  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 +3 -3
  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 +2 -2
  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 +2 -2
  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: 96e4d934fc2d51a5bbe4bc72af3571327447e6b6216e23841978440fea078f25
4
+ data.tar.gz: 7b652d18b0d2a663ab6808dcb13a76eeed2fcc9d55d8cfc5b5cde46becdf4a2f
5
5
  SHA512:
6
- metadata.gz: '08b459527dfa059b50ccdb60ffc2cd6ecd983afb778d9b5d5ceb77fb0b415301d0794053865ad0bca41d9476f5895da71c56dc1165183ec738159080f9c83398'
7
- data.tar.gz: 9eab3b0a20193b070b4f41cc0f998ece12ce2ab0a8f7cf616c7367794d6fb48d931d1b0c83316742c5cc49f1b2ac997dc8f1c20796dbcbb59fcb7126c6f64924
6
+ metadata.gz: 579169b33271da9334e095c53bc57d2b09b0eed9638c45b26562d77e22d902a1d313be9880b2276e24fae45b372417823d119a34e158e183505160f84e84066d
7
+ data.tar.gz: 5f05c3cdd6e9ab5030ddf719d79f6ab9dce2462791e0219b865abdf339d61364ab4dd2f1aa7fbe021c7d8c11d2768fe336cd386c135294630c17c55de96479f4
@@ -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 11.1.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",
@@ -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 11.1.0",
7
7
  "Report-Msgid-Bugs-To": "",
8
8
  "PO-Revision-Date": "2016-04-14 07:48+0000",
9
9
  "Last-Translator": "pdolinic, 2021",
@@ -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 11.1.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>",
@@ -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 11.1.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>",
@@ -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 11.1.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",
@@ -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 11.1.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",
@@ -902,7 +902,7 @@
902
902
  "Les %{key_name} suivants étaient manquants pour %{item_name} : %{key_names}. Assurez-vous qu'ils aient bien été importés avant de poursuivre."
903
903
  ],
904
904
  "The host was moved or deleted": [
905
- "L'hôte a été déplacé ou supprimé"
905
+ ""
906
906
  ],
907
907
  "The identifier of the host": [
908
908
  "Identifiant de l’hôte"
@@ -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 11.1.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>",
@@ -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 11.1.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",
@@ -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 11.1.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",
@@ -900,7 +900,7 @@
900
900
  "%{item_name} には、以下の %{key_name} がありませんでした: %{key_names}。続行前にインポートされていることを確認してください。"
901
901
  ],
902
902
  "The host was moved or deleted": [
903
- "ホストが移動または削除されました"
903
+ ""
904
904
  ],
905
905
  "The identifier of the host": [
906
906
  "ホストの ID"
@@ -924,7 +924,7 @@
924
924
  "これにより、foreman_scap_client のセットアップはユーザーにのみ残ります。受信 ARF レポートをリンクするには、ポリシーを定義する必要があります。"
925
925
  ],
926
926
  "This profile will be used to override the one from scap content": [
927
- "このプロファイルは、scap コンテンツのプロファイルをオーバーライドするために使用されます"
927
+ "このプロファイルは scrap コンテンツからのものを上書きするために使用されます"
928
928
  ],
929
929
  "Title": [
930
930
  "タイトル"
@@ -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 11.1.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>",
@@ -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 11.1.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",
@@ -900,7 +900,7 @@
900
900
  "다음은%{key_name}이/가 %{item_name}에 대해 누락되었습니다:%{key_names}. 계속하기 전에 반드시 가져왔는지 확인하세요."
901
901
  ],
902
902
  "The host was moved or deleted": [
903
- "호스트가 이동되었거나 삭제되었습니다."
903
+ ""
904
904
  ],
905
905
  "The identifier of the host": [
906
906
  "호스트의 식별자"
@@ -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 11.1.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",
@@ -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 11.1.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",
@@ -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 11.1.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>",
@@ -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 11.1.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",
@@ -900,7 +900,7 @@
900
900
  "%{item_name} 缺少以下 %{key_name}:%{key_names}。在继续操作之前,请确保已将其导入。"
901
901
  ],
902
902
  "The host was moved or deleted": [
903
- "主机被移动或删除"
903
+ ""
904
904
  ],
905
905
  "The identifier of the host": [
906
906
  "主机 ID"
@@ -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 11.1.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",
@@ -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)
@@ -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
 
@@ -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"]
@@ -1,3 +1,3 @@
1
1
  module ForemanOpenscap
2
- VERSION = "11.1.1".freeze
2
+ VERSION = "12.0.0".freeze
3
3
  end
@@ -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 11.1.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"
@@ -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 11.1.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"
@@ -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 11.1.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"
@@ -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 11.1.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"
@@ -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 11.1.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"
@@ -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-09-08 13:17+0000\n"
12
+ "PO-Revision-Date: 2025-09-08 13:17+0000\n"
13
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
15
  "Language: \n"
@@ -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 11.1.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"
@@ -921,7 +921,7 @@ msgid "The following %{key_name} were missing for %{item_name}: %{key_names}. Ma
921
921
  msgstr "Les %{key_name} suivants étaient manquants pour %{item_name} : %{key_names}. Assurez-vous qu'ils aient bien été importés avant de poursuivre."
922
922
 
923
923
  msgid "The host was moved or deleted"
924
- msgstr "L'hôte a été déplacé ou supprimé"
924
+ msgstr ""
925
925
 
926
926
  msgid "The identifier of the host"
927
927
  msgstr "Identifiant de l’hôte"
@@ -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 11.1.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"
@@ -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 11.1.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"
@@ -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 11.1.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"
@@ -918,7 +918,7 @@ msgid "The following %{key_name} were missing for %{item_name}: %{key_names}. Ma
918
918
  msgstr "%{item_name} には、以下の %{key_name} がありませんでした: %{key_names}。続行前にインポートされていることを確認してください。"
919
919
 
920
920
  msgid "The host was moved or deleted"
921
- msgstr "ホストが移動または削除されました"
921
+ msgstr ""
922
922
 
923
923
  msgid "The identifier of the host"
924
924
  msgstr "ホストの ID"
@@ -942,7 +942,7 @@ msgid "This leaves the setup of the foreman_scap_client solely on the user. The
942
942
  msgstr "これにより、foreman_scap_client のセットアップはユーザーにのみ残ります。受信 ARF レポートをリンクするには、ポリシーを定義する必要があります。"
943
943
 
944
944
  msgid "This profile will be used to override the one from scap content"
945
- msgstr "このプロファイルは、scap コンテンツのプロファイルをオーバーライドするために使用されます"
945
+ msgstr "このプロファイルは scrap コンテンツからのものを上書きするために使用されます"
946
946
 
947
947
  msgid "Title"
948
948
  msgstr "タイトル"
@@ -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 11.1.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"
@@ -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 11.1.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"
@@ -911,7 +911,7 @@ msgid "The following %{key_name} were missing for %{item_name}: %{key_names}. Ma
911
911
  msgstr "다음은%{key_name}이/가 %{item_name}에 대해 누락되었습니다:%{key_names}. 계속하기 전에 반드시 가져왔는지 확인하세요."
912
912
 
913
913
  msgid "The host was moved or deleted"
914
- msgstr "호스트가 이동되었거나 삭제되었습니다."
914
+ msgstr ""
915
915
 
916
916
  msgid "The identifier of the host"
917
917
  msgstr "호스트의 식별자"
@@ -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 11.1.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"
@@ -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 11.1.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"
@@ -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 11.1.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"
@@ -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 11.1.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"
@@ -917,7 +917,7 @@ msgid "The following %{key_name} were missing for %{item_name}: %{key_names}. Ma
917
917
  msgstr "%{item_name} 缺少以下 %{key_name}:%{key_names}。在继续操作之前,请确保已将其导入。"
918
918
 
919
919
  msgid "The host was moved or deleted"
920
- msgstr "主机被移动或删除"
920
+ msgstr ""
921
921
 
922
922
  msgid "The identifier of the host"
923
923
  msgstr "主机 ID"
@@ -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 11.1.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"
@@ -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
@@ -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.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - slukasik@redhat.com