foreman-tasks 0.7.14 → 0.7.15

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a5dbbae7a8675fb9d97a7d21be33d72cbd45f4d4
4
- data.tar.gz: f21021b14686f9ef30107e46006f5848cfab2e9a
3
+ metadata.gz: be3e1a5011a42e938ce2948393198a9987bb9824
4
+ data.tar.gz: 5124c56918697f1702f67991848f1114439219b3
5
5
  SHA512:
6
- metadata.gz: 62b2eb609c97a3de3c62645205efaccb50b81270fd18f253b1dd617e792d432fde847e44371a38fe128b9d5df3daa08f43d48e988bf982a61bc71a59f4234a27
7
- data.tar.gz: 07ba62f2aa4f72304325812584e34d3ac692fba4bc3a46b9a7a185532f2760ba6ecc4961776fe79d0c1f83806c2550d6fbe58eecfab5bd12840b375919f313f2
6
+ metadata.gz: 31373ad538d4fbed7d7f1c2817e38f58186d57f109bf3fab06fd86e8fb8eb0319989d877be4bac35ee52972273727c276accd10f7589d26e9aa7a9b25d5c45b2
7
+ data.tar.gz: 37315583adcdcb91cdcbbf4ed42e32a589631d743c11305b23d453f44ed8b6117ca0f03e4a450bdd68c6f2cb3130c5cc044507e26f4f98a6a6e5140bbd70e7de
@@ -88,6 +88,7 @@ module ForemanTasks
88
88
  method = "humanized_#{method}".to_sym
89
89
  end
90
90
  Match! method, :humanized_name, :humanized_input, :humanized_output, :humanized_errors
91
+ return N_('N/A') if method != :humanized_name && main_action.execution_plan.state == :scheduled
91
92
  @humanized_cache[method] ||= begin
92
93
  if main_action.respond_to? method
93
94
  begin
@@ -10,7 +10,7 @@
10
10
  </tr>
11
11
  <tr>
12
12
  <th><%= N_("Action") %></th>
13
- <td><%= format_task_input(recurring_logic.tasks.first, true) %></td>
13
+ <td><%= format_task_input(recurring_logic.tasks.last, true) %></td>
14
14
  </tr>
15
15
  <tr>
16
16
  <th><%= N_("Last occurrence") %></th>
@@ -5,8 +5,12 @@
5
5
  reload: function () {
6
6
  // we need different reload mechanism for two-pane and non-two-pane
7
7
  if (typeof currentTwoPaneTask !== 'undefined') {
8
- taskProgressReloader.timeoutId = null;
9
- two_pane_open(currentTwoPaneTask);
8
+ if($('.two-pane-right').length) {
9
+ taskProgressReloader.timeoutId = null;
10
+ two_pane_open(currentTwoPaneTask);
11
+ } else {
12
+ taskProgressReloader.stop();
13
+ }
10
14
  } else {
11
15
  document.location.reload();
12
16
  }
@@ -1,8 +1,11 @@
1
1
  view_permission = Permission.where(:name => :view_foreman_tasks, :resource_type => ForemanTasks::Task.name).first
2
2
 
3
+ # the anonymous role was renamed to default in
4
+ # https://github.com/theforeman/foreman/pull/3239
5
+ default_role = Role.respond_to?(:default) ? Role.default : Role.anonymous
3
6
  # the view_permissions can be nil in tests: skipping in that case
4
- if view_permission && !Role.anonymous.permissions.include?(view_permission)
5
- Role.anonymous.filters.create(:search => 'owner.id = current_user') do |filter|
7
+ if view_permission && !default_role.permissions.include?(view_permission)
8
+ default_role.filters.create(:search => 'owner.id = current_user') do |filter|
6
9
  filter.filterings.build { |f| f.permission = view_permission }
7
10
  end
8
11
  end
@@ -1,3 +1,3 @@
1
1
  module ForemanTasks
2
- VERSION = "0.7.14"
2
+ VERSION = "0.7.15"
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: 0.7.14
4
+ version: 0.7.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ivan Nečas
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-16 00:00:00.000000000 Z
11
+ date: 2016-03-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: dynflow