Őry Máté · @orymate · Bach Dániel · Őry Máté · Őry Máté
--- a/circle/dashboard/forms.py
+++ b/circle/dashboard/forms.py
+        choices = kwargs.pop('choices')
+        default = kwargs.pop('default')
+        super(VmRenewForm, self).__init__(*args, **kwargs)
+
+        self.fields['lease'] = forms.ModelChoiceField(queryset=choices,
+                                                      initial=default,
+                                                      required=True,
+                                                      label=_('Length'))
+        if len(choices) < 2:
+            self.fields['lease'].widget = HiddenInput()
+
+    def clean_size(self):
+        size_in_bytes = self.cleaned_data.get("size")
+        if not size_in_bytes.isdigit() and len(size_in_bytes) > 0:
+            raise forms.ValidationError(_("Invalid format, you can use "
+                                          " GB or MB!"))
--- a/circle/vm/models/common.py
+++ b/circle/vm/models/common.py
        app_label = 'vm'
        db_table = 'vm_lease'
        ordering = ['name', ]
+        permissions = (
+            ('create_leases', _('Can create new leases.')),
+            ('bypass_leases', _('Can set arbitrary expiration times.')),