dashboard: disabled resizing disks w wrong type

circle/dashboard/templates/dashboard/_disk-list-element.html

@@ -6,18 +6,18 @@
 
 
 
 
 <span class="operation-wrapper pull-right">
 <span class="operation-wrapper pull-right">
-  {% if op.resize_disk %}
-    <a href="{{ op.resize_disk.get_url }}?disk={{d.pk}}"
-      class="btn btn-xs btn-{{ op.resize_disk.effect }} operation disk-resize-btn
-      {% if op.resize_disk.disabled %}disabled{% endif %}">
-      <i class="fa fa-{{ op.resize_disk.icon }} fa-fw-12"></i> {% trans "Resize" %}
-    </a>
-  {% elif d.is_resizable %}
-    <a href="{% url "request.views.request-resize" vm_pk=instance.pk disk_pk=d.pk %}" class="btn btn-xs btn-primary operation">
-      <i class="fa fa-arrows-alt fa-fw-12"></i> {% trans "Request resize" %}
-    </a>
-  {% else %}
-    <small class="text-muted">{% trans "Cannot be resized" %}</small>
+  {% if d.is_resizable %}
+    {% if op.resize_disk %}
+      <a href="{{ op.resize_disk.get_url }}?disk={{d.pk}}"
+        class="btn btn-xs btn-{{ op.resize_disk.effect }} operation disk-resize-btn
+        {% if op.resize_disk.disabled %}disabled{% endif %}">
+        <i class="fa fa-{{ op.resize_disk.icon }} fa-fw-12"></i> {% trans "Resize" %}
+      </a>
+    {% else %}
+      <a href="{% url "request.views.request-resize" vm_pk=instance.pk disk_pk=d.pk %}" class="btn btn-xs btn-primary operation">
+        <i class="fa fa-arrows-alt fa-fw-12"></i> {% trans "Request resize" %}
+      </a>
+    {% endif %}
   {% endif %}
   {% endif %}
   {% if op.remove_disk %}
   {% if op.remove_disk %}
     <a href="{{ op.remove_disk.get_url }}?disk={{d.pk}}"
     <a href="{{ op.remove_disk.get_url }}?disk={{d.pk}}"

circle/vm/operations.py

@@ -305,6 +305,9 @@ class ResizeDiskOperation(RemoteInstanceOperation):
             size=filesizeformat(kwargs['size']), name=kwargs['disk'].name)
             size=filesizeformat(kwargs['size']), name=kwargs['disk'].name)
 
 
     def _operation(self, disk, size):
     def _operation(self, disk, size):
+        if not disk.is_resizable:
+            raise HumanReadableException.create(ugettext_noop(
+                'Disk type "%(type)s" is not resizable.'), type=disk.type)
         super(ResizeDiskOperation, self)._operation(disk=disk, size=size)
         super(ResizeDiskOperation, self)._operation(disk=disk, size=size)
         disk.size = size
         disk.size = size
         disk.save()
         disk.save()