foreman_remote_execution 12.0.1 → 12.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6385c407f978cf02cd096ef099c9c1304da27c67afcea48e91bd484b869a2635
-  data.tar.gz: 5997c4f5af4cc4624f3955f869e4076856918c0611da644d75a95017a5dd2dac
+  metadata.gz: 230bf89e8ad5ca9add72085b2d338562ca756f08fb9ce3837b588a4f295a5336
+  data.tar.gz: 6e55dc4a21cc35f4402d3f0056c073d28b7e911dafdaf2c9410642fcd397ad86
 SHA512:
-  metadata.gz: e24eb75f9d677836b32f4f6c4b6bb4d4b43a0934d63bb3ea80b2e66e6f9787d5792bef99ed5c01d9b1ec23547e0c5cc79660205ce3040612d940a19b64f3e8d2
-  data.tar.gz: 1957e681e82ad9093d95949b47dec5d273b0c14f1aee46465490126dd97eb5d3f85b8335183ca56629d36fff439b7f4ae9624bbe9c236715d5e7f82fab20a6f0
+  metadata.gz: ea882c01f9c360df7d5b4def426a4d3a43c7401a805642bf934fdab828c936463e2373f2c7bfd10e68a7e4d46d217f092275f2a07e434335fd2afb641b136678
+  data.tar.gz: e11419f9dbad58f603d49999ac9e22c6c9416176e728b6ec611228d5744990e8d4d0b51f5f0f48aa56705011276419501484b4215a06ad696d6cf5e2c12519fe

data/app/helpers/concerns/foreman_remote_execution/job_templates_extensions.rb

@@ -4,7 +4,7 @@ module ForemanRemoteExecution
       original = super(template)
 
       if template.is_a?(JobTemplate)
-        original.unshift(display_link_if_authorized(_('Run'), hash_for_new_job_invocation_path(:template_id => template.id).merge(:authorizer => authorizer))) unless template.snippet
+        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
       end
 
       original

data/app/helpers/remote_execution_helper.rb

@@ -33,8 +33,7 @@ module RemoteExecutionHelper
       links << { title: _('Host detail'),
         action: { href: current_host_details_path(host), 'data-method': 'get', id: "#{host.name}-actions-detail" } }
     end
-
-    if authorized_for(hash_for_rerun_job_invocation_path(id: job_invocation, host_ids: [ host.id ], authorizer: job_hosts_authorizer))
+    if authorized_for(controller: :job_invocations, action: :create) && (!host.infrastructure_host? || User.current.can?(:execute_jobs_on_infrastructure_hosts))
       links << { title: (_('Rerun on %s') % host.name),
         action: { href: rerun_job_invocation_path(job_invocation, host_ids: [ host.id ]),
                   'data-method': 'get', id: "#{host.name}-actions-rerun" } }
@@ -56,7 +55,7 @@ module RemoteExecutionHelper
   def job_invocations_buttons
     [
       documentation_button_rex('3.2ExecutingaJob'),
-      display_link_if_authorized(_('Run Job'), hash_for_new_job_invocation_path, {:class => "btn btn-primary"}),
+      authorized_for(controller: :job_invocations, action: :create) ? link_to(_('Run Job'), hash_for_new_job_invocation_path, {:class => "btn btn-primary"}) : '',
     ]
   end
 
@@ -70,12 +69,12 @@ module RemoteExecutionHelper
         title: _('Create report for this job'),
         disabled: task.pending?)
     end
-    if authorized_for(hash_for_new_job_invocation_path)
+    if authorized_for(controller: :job_invocations, action: :create)
       buttons << link_to(_('Rerun'), rerun_job_invocation_path(:id => job_invocation.id),
         :class => 'btn btn-default',
         :title => _('Rerun the job'))
     end
-    if authorized_for(hash_for_new_job_invocation_path)
+    if authorized_for(controller: :job_invocations, action: :create)
       buttons << link_to(_('Rerun failed'), rerun_job_invocation_path(:id => job_invocation.id, :failed_only => 1),
         :class => 'btn btn-default',
         :disabled => job_invocation.failed_hosts.none?,

data/app/views/job_invocations/new.html.erb

@@ -2,8 +2,8 @@
 <% stylesheet 'foreman_remote_execution/foreman_remote_execution' %>
 <% title _('Job invocation') %>
 <% if(request.path_parameters[:action] == "rerun") %>
-  <%= display_link_if_authorized(_('Use new job wizard'), hash_for_rerun_job_invocation_path({:id => request.path_parameters[:id]}).merge(request.query_parameters)) %>
+  <%= 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 %>
 <% else %>
-  <%= display_link_if_authorized(_('Use new job wizard'), hash_for_new_job_invocation_path().merge(request.query_parameters)) %>
+  <%= authorized_for(controller: :job_invocations, action: :create) ? link_to(_('Use new job wizard'), hash_for_new_job_invocation_path().merge(request.query_parameters)) : nil %>
 <%end%>
 <%= render :partial => 'form' %>

data/app/views/job_invocations/welcome.html.erb

@@ -9,6 +9,6 @@
     <p><%= link_to _('Learn more about this in the documentation.'),
            documentation_url('1.ForemanRemoteExecution1.3Manual', :root_url => 'https://www.theforeman.org/plugins/foreman_remote_execution/1.3/index.html#'), :rel => 'external' %></p>
     <div class="blank-slate-pf-main-action">
-        <%= display_link_if_authorized(_("Run Job"), { :action => :create }, { :class => "btn btn-primary btn-lg" }) %>
+        <%= authorized_for(controller: :job_invocations, action: :create) ? link_to(_("Run Job"), { :action => :create }, { :class => "btn btn-primary btn-lg" }) : nil %>
     </div>
 </div>

data/lib/foreman_remote_execution/engine.rb

@@ -177,8 +177,11 @@ module ForemanRemoteExecution
                                             :'api/v2/job_templates' => [:update],
                                             :'api/v2/template_inputs' => [:create, :update, :destroy],
                                             :'api/v2/foreign_input_sets' => [:create, :update, :destroy]}, :resource_type => 'JobTemplate'
-          permission :edit_remote_execution_features, { :remote_execution_features => [:index, :show, :update],
-                                                        :'api/v2/remote_execution_features' => [:index, :show, :update, :available_remote_execution_features]}, :resource_type => 'RemoteExecutionFeature'
+          permission :view_remote_execution_features, { :remote_execution_features => [:index, :show],
+                                                        :'api/v2/remote_execution_features' => [:index, :show, :available_remote_execution_features]},
+            :resource_type => 'RemoteExecutionFeature'
+          permission :edit_remote_execution_features, { :remote_execution_features => [:update],
+                                                        :'api/v2/remote_execution_features' => [:update ]}, :resource_type => 'RemoteExecutionFeature'
           permission :destroy_job_templates, { :job_templates => [:destroy],
                                                :'api/v2/job_templates' => [:destroy] }, :resource_type => 'JobTemplate'
           permission :lock_job_templates, { :job_templates => [:lock, :unlock] }, :resource_type => 'JobTemplate'
@@ -204,6 +207,7 @@ module ForemanRemoteExecution
           :create_template_invocations,
           :view_hosts,
           :view_smart_proxies,
+          :view_remote_execution_features,
         ].freeze
         MANAGER_PERMISSIONS = USER_PERMISSIONS + [
           :cancel_job_invocations,

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '12.0.1'.freeze
+  VERSION = '12.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 12.0.1
+  version: 12.0.2
 platform: ruby
 authors:
 - Foreman Remote Execution team