diff --git a/app/models/mixins/supports_feature_mixin.rb b/app/models/mixins/supports_feature_mixin.rb index 5202c49b282..540cad1d886 100644 --- 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 index d73d9fa783b..28f35ac7f53 100644 --- 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?