Fixes #36892 - Pass host results to REX slot;

allow root node permissions to be extended
theforeman · Nov 20, 2023 · c679c47 · c679c47
1 parent b1883f4
commit c679c47
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/controllers/api/v2/base_controller.rb b/app/controllers/api/v2/base_controller.rb
@@ -47,7 +47,7 @@ class BaseController < Api::BaseController
       layout 'api/v2/layouts/index_layout', :only => :index
 
       helper_method :root_node_name, :metadata_total, :metadata_subtotal, :metadata_search,
-        :metadata_order, :metadata_by, :metadata_page, :metadata_per_page
+        :metadata_order, :metadata_by, :metadata_page, :metadata_per_page, :index_node_permissions
       def root_node_name
         @root_node_name ||= if Rabl.configuration.use_controller_name_as_json_root
                               controller_name.split('/').last
@@ -58,6 +58,13 @@ def root_node_name
                             end
       end
 
+      def index_node_permissions
+        {
+          :can_create => can_create?,
+          :can_edit => authorized_for(:controller => controller_name, :action => 'edit')
+        }
+      end
+
       def metadata_total
         @total ||= resource_scope.try(:size).to_i
       end

diff --git a/app/views/api/v2/layouts/index_layout.json.erb b/app/views/api/v2/layouts/index_layout.json.erb
@@ -5,8 +5,7 @@
   "per_page": <%= metadata_per_page.to_json %>,
   "search": <%= metadata_search.to_json.html_safe %>,
 <% if params.has_key?(:include_permissions) %>
-  "can_create": <%= can_create?.to_json %>,
-  "can_edit": <%= can_edit?.to_json %>,
+  <%= index_node_permissions.to_json.gsub(/[{}]/,'').html_safe %>,
 <% end %>
   "sort": {
     "by": <%= metadata_by.to_json.html_safe %>,

diff --git a/webpack/assets/javascripts/react_app/components/HostsIndex/index.js b/webpack/assets/javascripts/react_app/components/HostsIndex/index.js
@@ -213,7 +213,8 @@ const HostsIndex = () => {
           <SplitItem>
             <Slot
               id="_all-hosts-schedule-a-job"
-              hostSearch={selectedCount && fetchBulkParams()}
+              hostSearch={selectedCount ? fetchBulkParams() : null}
+              hostResponse={response}
               selectedCount={selectedCount}
             />
           </SplitItem>