Merge pull request #6712 from h-kataria/foreman_explorer_right_cell_r…

…eplace_fix Render 'layouts/empty' partial correctly. (cherry picked from commit 90ccf51) https://bugzilla.redhat.com/show_bug.cgi?id=1741310
ManageIQ · Jun 18, 2020 · fadc5cd · fadc5cd
1 parent 99af0db
commit fadc5cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/controllers/provider_foreman_controller.rb b/app/controllers/provider_foreman_controller.rb
@@ -189,6 +189,7 @@ def validate_before_save?
   def provider_active_tree?
     x_active_tree == :configuration_manager_providers_tree
   end
+  helper_method(:provider_active_tree?)
 
   private
 
@@ -385,6 +386,10 @@ def update_partials(record_showing, presenter)
       presenter.remove_sand
       presenter.update(:main_div, r[:partial => "configuration_profile",
                                     :locals  => {:controller => controller_name}])
+    elsif ManageIQ::Providers::ConfigurationManager.none? && provider_active_tree?
+      presenter.update(:main_div, r[:partial => "layouts/empty",
+                                    :locals  => {:add_message   => _("Add a new Configuration Management Provider"),
+                                                 :documentation => ::Settings.docs.configuration_provider}])
     else
       presenter.update(:main_div, r[:partial => 'layouts/x_gtl'])
     end

diff --git a/app/views/provider_foreman/explorer.html.haml b/app/views/provider_foreman/explorer.html.haml
@@ -22,10 +22,11 @@
     = render(:partial => 'provider_foreman/configuration_script', :locals => {:controller => "provider_foreman"})
 - else
   #main_div
-    - if ManageIQ::Providers::ConfigurationManager.any?
-      = render(:partial => 'layouts/x_gtl')
-    - else
+    - if ManageIQ::Providers::ConfigurationManager.none? && provider_active_tree?
       = render :partial => 'layouts/empty',
                :locals => {:add_message => _("Add a new Configuration Management Provider"),
                            :documentation => ::Settings.docs.configuration_provider}
+    - else
+      = render(:partial => 'layouts/x_gtl')
+