foreman_remote_execution 10.1.2 → 10.1.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f0dd84575d5ad4d4006d49d53c0fc6a82826a9a886b4269a9cd00db0c846cfe5
4
- data.tar.gz: 9f2e38c2ac0a3236a0c94f445b46ed881d52fdfee685013c75051bc8de809658
3
+ metadata.gz: 2c5a4d2e221f3ed0c50a049152bf51129b1e2d548a42bd23221a4e1033e2776c
4
+ data.tar.gz: 6668e37f2476ab6a7a10af220f5d6f4097e1fd93c6fa291badc4e8df0a7b3027
5
5
  SHA512:
6
- metadata.gz: 0a327205fab5560a3ad990690836319b6177aed752ed0318222ca37419a00416db96da5e7b6735da71b1a37620f607c4b96204e8ccfb20be7cbaf30379236d81
7
- data.tar.gz: 96c0700fcfe6c5b46b72f1af95e0bdcf62ed322c8fdca9155f11bc3172dd756ab5e1915cfcb111bfd301372f13bca30cb51ccb81577c87ad68080ebe3ea113ec
6
+ metadata.gz: 4a073678bdeb6f1ef3a00874d4d584a13ee4a9ab446328c275ff165a7ff026416ac5d54be30e20cddad12bad3dba710036480ba3faeb353deb1e0cc10172d6d3
7
+ data.tar.gz: 5f482b7e1073c9114498d50290ddd204bdec4167b62c3fb3bab63216e0856a05922508d725ce2326cc6e7510865c514eaaeccf75adbd1acd28d9776a9cd371c7
@@ -4,7 +4,7 @@ module ForemanRemoteExecution
4
4
  original = super(template)
5
5
 
6
6
  if template.is_a?(JobTemplate)
7
- original.unshift(display_link_if_authorized(_('Run'), hash_for_new_job_invocation_path(:template_id => template.id).merge(:authorizer => authorizer))) unless template.snippet
7
+ original.unshift(authorized_for(controller: :job_invocations, action: :create) ? link_to(_('Run'), hash_for_new_job_invocation_path(:template_id => template.id).merge(:authorizer => authorizer)) : nil) unless template.snippet
8
8
  end
9
9
 
10
10
  original
@@ -33,8 +33,7 @@ module RemoteExecutionHelper
33
33
  links << { title: _('Host detail'),
34
34
  action: { href: current_host_details_path(host), 'data-method': 'get', id: "#{host.name}-actions-detail" } }
35
35
  end
36
-
37
- if authorized_for(hash_for_rerun_job_invocation_path(id: job_invocation, host_ids: [ host.id ], authorizer: job_hosts_authorizer))
36
+ if authorized_for(controller: :job_invocations, action: :create) && (!host.infrastructure_host? || User.current.can?(:execute_jobs_on_infrastructure_hosts))
38
37
  links << { title: (_('Rerun on %s') % host.name),
39
38
  action: { href: rerun_job_invocation_path(job_invocation, host_ids: [ host.id ]),
40
39
  'data-method': 'get', id: "#{host.name}-actions-rerun" } }
@@ -56,7 +55,7 @@ module RemoteExecutionHelper
56
55
  def job_invocations_buttons
57
56
  [
58
57
  documentation_button_rex('3.2ExecutingaJob'),
59
- display_link_if_authorized(_('Run Job'), hash_for_new_job_invocation_path, {:class => "btn btn-primary"}),
58
+ authorized_for(controller: :job_invocations, action: :create) ? link_to(_('Run Job'), hash_for_new_job_invocation_path, {:class => "btn btn-primary"}) : '',
60
59
  ]
61
60
  end
62
61
 
@@ -70,12 +69,12 @@ module RemoteExecutionHelper
70
69
  title: _('Create report for this job'),
71
70
  disabled: task.pending?)
72
71
  end
73
- if authorized_for(hash_for_new_job_invocation_path)
72
+ if authorized_for(controller: :job_invocations, action: :create)
74
73
  buttons << link_to(_('Rerun'), rerun_job_invocation_path(:id => job_invocation.id),
75
74
  :class => 'btn btn-default',
76
75
  :title => _('Rerun the job'))
77
76
  end
78
- if authorized_for(hash_for_new_job_invocation_path)
77
+ if authorized_for(controller: :job_invocations, action: :create)
79
78
  buttons << link_to(_('Rerun failed'), rerun_job_invocation_path(:id => job_invocation.id, :failed_only => 1),
80
79
  :class => 'btn btn-default',
81
80
  :disabled => job_invocation.failed_hosts.none?,
@@ -2,8 +2,8 @@
2
2
  <% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
3
3
  <% title _('Job invocation') %>
4
4
  <% if(request.path_parameters[:action] == "rerun") %>
5
- <%= display_link_if_authorized(_('Use new job wizard'), hash_for_rerun_job_invocation_path({:id => request.path_parameters[:id]}).merge(request.query_parameters)) %>
5
+ <%= authorized_for(controller: :job_invocations, action: :create) ? link_to(_('Use new job wizard'), hash_for_rerun_job_invocation_path({:id => request.path_parameters[:id]}).merge(request.query_parameters)) : nil %>
6
6
  <% else %>
7
- <%= display_link_if_authorized(_('Use new job wizard'), hash_for_new_job_invocation_path().merge(request.query_parameters)) %>
7
+ <%= authorized_for(controller: :job_invocations, action: :create) ? link_to(_('Use new job wizard'), hash_for_new_job_invocation_path().merge(request.query_parameters)) : nil %>
8
8
  <%end%>
9
9
  <%= render :partial => 'form' %>
@@ -9,6 +9,6 @@
9
9
  <p><%= link_to _('Learn more about this in the documentation.'),
10
10
  documentation_url('1.ForemanRemoteExecution1.3Manual', :root_url => 'https://www.theforeman.org/plugins/foreman_remote_execution/1.3/index.html#'), :rel => 'external' %></p>
11
11
  <div class="blank-slate-pf-main-action">
12
- <%= display_link_if_authorized(_("Run Job"), { :action => :create }, { :class => "btn btn-primary btn-lg" }) %>
12
+ <%= authorized_for(controller: :job_invocations, action: :create) ? link_to(_("Run Job"), { :action => :create }, { :class => "btn btn-primary btn-lg" }) : nil %>
13
13
  </div>
14
14
  </div>
@@ -177,8 +177,11 @@ module ForemanRemoteExecution
177
177
  :'api/v2/job_templates' => [:update],
178
178
  :'api/v2/template_inputs' => [:create, :update, :destroy],
179
179
  :'api/v2/foreign_input_sets' => [:create, :update, :destroy]}, :resource_type => 'JobTemplate'
180
- permission :edit_remote_execution_features, { :remote_execution_features => [:index, :show, :update],
181
- :'api/v2/remote_execution_features' => [:index, :show, :update, :available_remote_execution_features]}, :resource_type => 'RemoteExecutionFeature'
180
+ permission :view_remote_execution_features, { :remote_execution_features => [:index, :show],
181
+ :'api/v2/remote_execution_features' => [:index, :show, :available_remote_execution_features]},
182
+ :resource_type => 'RemoteExecutionFeature'
183
+ permission :edit_remote_execution_features, { :remote_execution_features => [:update],
184
+ :'api/v2/remote_execution_features' => [:update ]}, :resource_type => 'RemoteExecutionFeature'
182
185
  permission :destroy_job_templates, { :job_templates => [:destroy],
183
186
  :'api/v2/job_templates' => [:destroy] }, :resource_type => 'JobTemplate'
184
187
  permission :lock_job_templates, { :job_templates => [:lock, :unlock] }, :resource_type => 'JobTemplate'
@@ -204,6 +207,7 @@ module ForemanRemoteExecution
204
207
  :create_template_invocations,
205
208
  :view_hosts,
206
209
  :view_smart_proxies,
210
+ :view_remote_execution_features,
207
211
  ].freeze
208
212
  MANAGER_PERMISSIONS = USER_PERMISSIONS + [
209
213
  :cancel_job_invocations,
@@ -1,3 +1,3 @@
1
1
  module ForemanRemoteExecution
2
- VERSION = '10.1.2'.freeze
2
+ VERSION = '10.1.3'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_remote_execution
3
3
  version: !ruby/object:Gem::Version
4
- version: 10.1.2
4
+ version: 10.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Foreman Remote Execution team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2023-12-08 00:00:00.000000000 Z
11
+ date: 2024-04-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: deface
@@ -578,7 +578,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
578
578
  - !ruby/object:Gem::Version
579
579
  version: '0'
580
580
  requirements: []
581
- rubygems_version: 3.1.6
581
+ rubygems_version: 3.3.26
582
582
  signing_key:
583
583
  specification_version: 4
584
584
  summary: A plugin bringing remote execution to the Foreman, completing the config