Merge pull request #7639 from agrare/replace_host_validate_destroy_wi…

…th_supports_feature Replace Host.validate_destroy with supports feature
ManageIQ · Feb 24, 2021 · 54cc0a5 · 54cc0a5
2 parents e959d77 + 912ad58
commit 54cc0a5
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/app/controllers/mixins/actions/host_actions/misc.rb b/app/controllers/mixins/actions/host_actions/misc.rb
@@ -34,9 +34,8 @@ def process_hosts_refresh(hosts, task, display_name)
 
         def process_hosts_destroy(hosts, display_name)
           each_host(hosts, display_name) do |host|
-            validation = host.validate_destroy
-            if !validation[:available]
-              add_flash(validation[:message], :error)
+            if !host.supports?(:destroy)
+              add_flash(host.unsupported_reason(:destroy), :error)
             else
               audit = {:event        => "host_record_delete_initiated",
                        :message      => "[#{host.name}] Record delete initiated",