Merge "allow errored volume to be deleted since nova api allows it now"

openstack · Mar 15, 2012 · f00f177 · f00f177
2 parents b8754d5 + 3ab6377
commit f00f177
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py b/horizon/dashboards/nova/instances_and_volumes/volumes/tables.py
@@ -43,15 +43,6 @@ def allowed(self, request, volume=None):
             return volume.status in DELETABLE_STATES
         return True
 
-    def update(self, request, volume=None):
-        # TODO(gabriel): This can be removed once the Nova Volume API supports
-        # deleting volumes in error states.
-        if volume and getattr(volume, "status", None) == "error":
-            self.classes += ("disabled",)
-            self.attrs['disabled'] = 'disabled'
-            self.attrs['title'] = _("Volumes in error states cannot be "
-                                    "deleted via the Nova API.")
-
 
 class CreateVolume(tables.LinkAction):
     name = "create"