dashboard: allow choosing disk in resize form

circle/dashboard/forms.py

@@ -801,13 +801,15 @@ class VmDiskResizeForm(forms.Form):
 
 
     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):
         choices = kwargs.pop('choices')
         choices = kwargs.pop('choices')
-        default = kwargs.pop('default')
+        self.disk = kwargs.pop('default')
 
 
         super(VmDiskResizeForm, self).__init__(*args, **kwargs)
         super(VmDiskResizeForm, self).__init__(*args, **kwargs)
 
 
         self.fields.insert(0, 'disk', forms.ModelChoiceField(
         self.fields.insert(0, 'disk', forms.ModelChoiceField(
-            queryset=choices, initial=default, required=True,
+            queryset=choices, initial=self.disk, required=True,
             empty_label=None, label=_('Disk')))
             empty_label=None, label=_('Disk')))
+        if self.disk:
+            self.fields['disk'].widget = HiddenInput()
 
 
     def clean(self):
     def clean(self):
         cleaned_data = super(VmDiskResizeForm, self).clean()
         cleaned_data = super(VmDiskResizeForm, self).clean()
@@ -825,6 +827,10 @@ class VmDiskResizeForm(forms.Form):
     def helper(self):
     def helper(self):
         helper = FormHelper(self)
         helper = FormHelper(self)
         helper.form_tag = False
         helper.form_tag = False
+        if self.disk:
+            helper.layout = Layout(
+                HTML(_("<label>Disk:</label> %s") % self.disk),
+                Field('disk'), Field('size'))
         return helper
         return helper
 
 
 
 

circle/dashboard/views/vm.py

@@ -380,9 +380,9 @@ class VmDiskResizeView(FormOperationMixin, VmOperationView):
             try:
             try:
                 default = choices.get(pk=disk_pk)
                 default = choices.get(pk=disk_pk)
             except (ValueError, Disk.DoesNotExist):
             except (ValueError, Disk.DoesNotExist):
-                raise SuspiciousOperation()
+                raise Http404()
         else:
         else:
-            raise SuspiciousOperation()
+            default = None
 
 
         val = super(VmDiskResizeView, self).get_form_kwargs()
         val = super(VmDiskResizeView, self).get_form_kwargs()
         val.update({'choices': choices, 'default': default})
         val.update({'choices': choices, 'default': default})