Merge pull request #17780 from hstastna/Error_delete_cloud_image_inst…

…ance Fix Remove Selected Items from Inventory button for Images, Instances
ManageIQ · Aug 1, 2018 · 4d2223b · 4d2223b
2 parents aa2db73 + 7de8cf2
commit 4d2223b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/app/models/mixins/supports_feature_mixin.rb b/app/models/mixins/supports_feature_mixin.rb
@@ -79,6 +79,7 @@ module SupportsFeatureMixin
     :external_logging                    => 'Launch External Logging UI',
     :swift_service                       => 'Swift storage service',
     :delete                              => 'Deletion',
+    :destroy                             => 'Destroy',
     :delete_aggregate                    => 'Host Aggregate Deletion',
     :delete_floating_ip                  => 'Floating IP Deletion',
     :delete_security_group               => 'Security Group Deletion',

diff --git a/app/models/vm_or_template.rb b/app/models/vm_or_template.rb
@@ -1725,6 +1725,7 @@ def self.includes_template?(ids)
   end
 
   supports_not :snapshots
+  supports :destroy
 
   # Stop showing Reconfigure VM task unless the subclass allows
   def reconfigurable?