foreman-tasks 8.1.0 → 8.1.2

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 (8) hide show
  1. checksums.yaml +4 -4
  2. data/app/lib/actions/check_long_running_tasks.rb +1 -1
  3. data/app/lib/actions/deliver_long_running_tasks_notification.rb +1 -1
  4. data/app/lib/actions/middleware/load_setting_values.rb +5 -0
  5. data/app/views/tasks_mailer/long_tasks.html.erb +6 -6
  6. data/app/views/tasks_mailer/long_tasks.text.erb +6 -6
  7. data/lib/foreman_tasks/version.rb +1 -1
  8. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8cbc85cc5038629927d1204242995f7a8ffa0074caaa56fcc7886f6f2093dff1
4
- data.tar.gz: 4f848db967c1791278c0fc9cebe3ddaa3a7fd3500208995ae84289496710db4d
3
+ metadata.gz: f756b8531e37e0f3e1b5c8656497ef1386484aae197a25be5b157343b65d3859
4
+ data.tar.gz: 6e83619c23d91aeaf92d3ddd01a76bb65f331d5c48041f3e1aa037d97c3da4f6
5
5
  SHA512:
6
- metadata.gz: ba8c8768bdaef20f5750b1052e9d43b525fee4260c81c0e61e0847cab958fc534129065d24f556920f2f5270fd8aad7192f808e60ee5fd693eedb54b8afdb77c
7
- data.tar.gz: 0e8628e1db3a0a7fb800ae92fc722d7c7af1feaf9cebf659117f08686f0dae70f376ffe7236a7a99b2c6d1e20ed47e40194f52d37a3b5b0a653a23879460738e
6
+ metadata.gz: 96d0a2eb2c41ec9643119c8bb7e0447ddb43f249cf4d217713c77042fabdb54da44b635c9e4d538b9daca760fec82077810e31d684122313dc9fb1191a77c59f
7
+ data.tar.gz: 73e47dceafb38096f63cf605d8016a3dfb112cc5320f2dd70fb527c805c99f86255c882e40b7504f9383e03dc441802b0cf208d4957ea3c77fde4b7dc5d93154
data/app/lib/actions/check_long_running_tasks.rb CHANGED
@@ -11,7 +11,7 @@ module Actions
11
11
  notification = ::ForemanTasks::TasksMailNotification.find_by(name: "long_running_tasks")
12
12
  org_admin_role = Role.find_by(name: 'Organization admin')
13
13
  users = User.left_joins(:roles)
14
- .where(id: UserMailNotification.where(mail_notification_id: notification.id).select(:host_id))
14
+ .where(id: UserMailNotification.where(mail_notification_id: notification.id).select(:role_id))
15
15
  .or(User.where(admin: true))
16
16
  .or(User.where(id: UserRole.where(id: [org_admin_role.id] + org_admin_role.cloned_role_ids).select(:owner_id)))
17
17
 
data/app/lib/actions/deliver_long_running_tasks_notification.rb CHANGED
@@ -11,7 +11,7 @@ module Actions
11
11
  tasks = ForemanTasks::Task.where(id: report.task_uuids)
12
12
  report.user = User.current
13
13
  report.tasks = tasks
14
- ::UINotifications::Tasks::TasksRunningLong.new.deliver!
14
+ ::UINotifications::Tasks::TasksRunningLong.new(report).deliver!
15
15
  TasksMailer.long_tasks(report).deliver_now
16
16
  end
17
17
 
data/app/lib/actions/middleware/load_setting_values.rb CHANGED
@@ -25,6 +25,11 @@ module Actions
25
25
  pass(*args)
26
26
  end
27
27
 
28
+ def hook(*args)
29
+ reload_setting_values
30
+ pass(*args)
31
+ end
32
+
28
33
  private
29
34
 
30
35
  def reload_setting_values
data/app/views/tasks_mailer/long_tasks.html.erb CHANGED
@@ -8,11 +8,11 @@
8
8
  <div class="dashboard">
9
9
  <table>
10
10
  <tr>
11
- <th>_("ID")</th>
12
- <th>_("Action")</th>
13
- <th>_("Label")</th>
14
- <th>_("State")</th>
15
- <th>_("State updated at")</th>
11
+ <th><%= _("ID") %></th>
12
+ <th><%= _("Action") %></th>
13
+ <th><%= _("Label") %></th>
14
+ <th><%= _("State") %></th>
15
+ <th><%= _("State updated at") %></th>
16
16
  </tr>
17
17
  <% @report.tasks.each do |task| %>
18
18
  <tr>
@@ -26,4 +26,4 @@
26
26
  </table>
27
27
  </div>
28
28
 
29
- <%= link_to 'More details', foreman_tasks_tasks_url(search: @report.query) %>
29
+ <%= link_to _('More details'), foreman_tasks_tasks_url(search: @report.query) %>
data/app/views/tasks_mailer/long_tasks.text.erb CHANGED
@@ -6,11 +6,11 @@
6
6
  More details: <%= foreman_tasks_tasks_url(search: @report.query) %>
7
7
 
8
8
  <% @report.tasks.each do |task| %>
9
- ID: <%= task.id %>
10
- Action: <%= task.action %>
11
- Label: <%= task.label %>
12
- State: <%= task.state %>
13
- State updated at: <%= task.state_updated_at %>
14
- Details: <%= foreman_tasks_task_url(task) %>
9
+ <%= _('ID') %>: <%= task.id %>
10
+ <%= _('Action') %>: <%= task.action %>
11
+ <%= _('Label') %>: <%= task.label %>
12
+ <%= _('State') %>: <%= task.state %>
13
+ <%= _('State updated at') %>: <%= task.state_updated_at %>
14
+ <%= _('Details') %>: <%= foreman_tasks_task_url(task) %>
15
15
 
16
16
  <% end %>
data/lib/foreman_tasks/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ForemanTasks
2
- VERSION = '8.1.0'.freeze
2
+ VERSION = '8.1.2'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman-tasks
3
3
  version: !ruby/object:Gem::Version
4
- version: 8.1.0
4
+ version: 8.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Nečas
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-06-20 00:00:00.000000000 Z
11
+ date: 2023-07-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dynflow
@@ -627,7 +627,7 @@ homepage: https://github.com/theforeman/foreman-tasks
627
627
  licenses:
628
628
  - GPL-3.0
629
629
  metadata: {}
630
- post_install_message:
630
+ post_install_message:
631
631
  rdoc_options: []
632
632
  require_paths:
633
633
  - lib
@@ -642,8 +642,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
642
642
  - !ruby/object:Gem::Version
643
643
  version: '0'
644
644
  requirements: []
645
- rubygems_version: 3.4.13
646
- signing_key:
645
+ rubygems_version: 3.1.6
646
+ signing_key:
647
647
  specification_version: 4
648
648
  summary: Foreman plugin for showing tasks information for resources and users
649
649
  test_files: