dashboard: better way to handle disk add origin

circle/dashboard/forms.py

@@ -729,14 +729,14 @@ class DiskAddForm(forms.Form):
     name = forms.CharField()
     name = forms.CharField()
     size = forms.CharField(widget=FileSizeWidget, required=False)
     size = forms.CharField(widget=FileSizeWidget, required=False)
     url = forms.CharField(required=False)
     url = forms.CharField(required=False)
-    add_to = forms.CharField()
+    is_template = forms.CharField()
     object_pk = forms.CharField()
     object_pk = forms.CharField()
 
 
     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):
-        self.add_to = kwargs.pop("add_to")
+        self.is_template = kwargs.pop("is_template")
         self.object_pk = kwargs.pop("object_pk")
         self.object_pk = kwargs.pop("object_pk")
         super(DiskAddForm, self).__init__(*args, **kwargs)
         super(DiskAddForm, self).__init__(*args, **kwargs)
-        self.initial['add_to'] = self.add_to
+        self.initial['is_template'] = 1 if self.is_template is True else 0
         self.initial['object_pk'] = self.object_pk
         self.initial['object_pk'] = self.object_pk
 
 
     def clean_size(self):
     def clean_size(self):
@@ -773,7 +773,7 @@ class DiskAddForm(forms.Form):
             # TODO
             # TODO
             d = None
             d = None
 
 
-        if self.add_to == "template":
+        if self.is_template:
             vm_or_temp = InstanceTemplate.objects.get(pk=self.object_pk)
             vm_or_temp = InstanceTemplate.objects.get(pk=self.object_pk)
         else:
         else:
             vm_or_temp = Instance.objects.get(pk=self.object_pk)
             vm_or_temp = Instance.objects.get(pk=self.object_pk)
@@ -787,7 +787,7 @@ class DiskAddForm(forms.Form):
         helper = FormHelper()
         helper = FormHelper()
         helper.form_show_labels = False
         helper.form_show_labels = False
         helper.layout = Layout(
         helper.layout = Layout(
-            Field("add_to", type="hidden"),
+            Field("is_template", type="hidden"),
             Field("object_pk", type="hidden"),
             Field("object_pk", type="hidden"),
             Field("name", placeholder=_("Name")),
             Field("name", placeholder=_("Name")),
             Field("size", placeholder=_("Disk size (for example: 20GB, "
             Field("size", placeholder=_("Disk size (for example: 20GB, "

circle/dashboard/views.py

@@ -181,7 +181,7 @@ class VmDetailView(CheckedDetailView):
         context['acl'] = get_vm_acl_data(instance)
         context['acl'] = get_vm_acl_data(instance)
         context['forms'] = {
         context['forms'] = {
             'disk_add_form': DiskAddForm(
             'disk_add_form': DiskAddForm(
-                add_to="instance", object_pk=self.get_object().pk,
+                is_template=False, object_pk=self.get_object().pk,
                 prefix="disk"),
                 prefix="disk"),
         }
         }
         context['os_type_icon'] = instance.os_type.replace("unknown",
         context['os_type_icon'] = instance.os_type.replace("unknown",
@@ -733,7 +733,7 @@ class TemplateDetail(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
         context = super(TemplateDetail, self).get_context_data(**kwargs)
         context = super(TemplateDetail, self).get_context_data(**kwargs)
         context['acl'] = get_vm_acl_data(self.get_object())
         context['acl'] = get_vm_acl_data(self.get_object())
         context['disk_add_form'] = DiskAddForm(
         context['disk_add_form'] = DiskAddForm(
-            add_to="template",
+            is_template=True,
             object_pk=self.get_object().pk,
             object_pk=self.get_object().pk,
             prefix="disk",
             prefix="disk",
         )
         )
@@ -1711,11 +1711,20 @@ class VmMigrateView(SuperuserRequiredMixin, TemplateView):
 class DiskAddView(SuperuserRequiredMixin, TemplateView):
 class DiskAddView(SuperuserRequiredMixin, TemplateView):
 
 
     def post(self, *args, **kwargs):
     def post(self, *args, **kwargs):
-        add_to = self.request.POST.get("disk-add_to")
+        is_template = self.request.POST.get("disk-is_template")
         object_pk = self.request.POST.get("disk-object_pk")
         object_pk = self.request.POST.get("disk-object_pk")
+        is_template = int(is_template) == 1
+        if is_template:
+            obj = InstanceTemplate.objects.get(pk=object_pk)
+        else:
+            obj = Instance.objects.get(pk=object_pk)
+
+        if not obj.has_level(self.request.user, 'owner'):
+            raise PermissionDenied()
+
         form = DiskAddForm(
         form = DiskAddForm(
             self.request.POST,
             self.request.POST,
-            add_to=add_to, object_pk=object_pk,
+            is_template=is_template, object_pk=object_pk,
             prefix="disk"
             prefix="disk"
         )
         )
 
 
@@ -1728,9 +1737,9 @@ class DiskAddView(SuperuserRequiredMixin, TemplateView):
                                     for i in form.errors.items()])
                                     for i in form.errors.items()])
             messages.error(self.request, error)
             messages.error(self.request, error)
 
 
-        if add_to == "template":
-            r = InstanceTemplate.objects.get(pk=object_pk).get_absolute_url()
+        if is_template:
+            r = obj.get_absolute_url()
         else:
         else:
-            r = Instance.objects.get(pk=object_pk).get_absolute_url()
+            r = obj.get_absolute_url()
             r = "%s#resources" % r
             r = "%s#resources" % r
         return redirect(r)
         return redirect(r)