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 +4 -4
- data/app/models/foreman_tasks/task/dynflow_task.rb +1 -0
- data/app/views/foreman_tasks/task_groups/recurring_logic_task_groups/_recurring_logic_task_group.html.erb +1 -1
- data/app/views/foreman_tasks/tasks/show.html.erb +6 -2
- data/db/seeds.d/20-foreman_tasks_permissions.rb +5 -2
- data/lib/foreman_tasks/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: be3e1a5011a42e938ce2948393198a9987bb9824
|
|
4
|
+
data.tar.gz: 5124c56918697f1702f67991848f1114439219b3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
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
|
|
@@ -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
|
-
|
|
9
|
-
|
|
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 && !
|
|
5
|
-
|
|
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
|
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.
|
|
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-
|
|
11
|
+
date: 2016-03-03 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: dynflow
|