Skip to content

Fukász Rómeó Ervin / cloud

Go to a project
Commit 226d2b8d by Bach Dániel
Options

dashboard: improve VmCreate view

parent cdac5b0e
Showing with 20 additions and 21 deletions
circle/dashboard/views/vm.py
...@@ -983,6 +983,17 @@ class VmCreate(LoginRequiredMixin, TemplateView): ...@@ -983,6 +983,17 @@ class VmCreate(LoginRequiredMixin, TemplateView):
else: else:
return ['dashboard/nojs-wrapper.html'] return ['dashboard/nojs-wrapper.html']
def get_template(self, request, pk):
try:
template = InstanceTemplate.objects.get(
pk=int(pk))
except (ValueError, InstanceTemplate.DoesNotExist):
raise Http404()
if not template.has_level(request.user, 'user'):
raise PermissionDenied()
return template
def get(self, request, form=None, *args, **kwargs): def get(self, request, form=None, *args, **kwargs):
if not request.user.has_perm('vm.create_vm'): if not request.user.has_perm('vm.create_vm'):
raise PermissionDenied() raise PermissionDenied()
...@@ -993,9 +1004,7 @@ class VmCreate(LoginRequiredMixin, TemplateView): ...@@ -993,9 +1004,7 @@ class VmCreate(LoginRequiredMixin, TemplateView):
template_pk = form.template.pk template_pk = form.template.pk
if template_pk: if template_pk:
template = get_object_or_404(InstanceTemplate, pk=template_pk) template = self.get_template(request, template_pk)
if not template.has_level(request.user, 'user'):
raise PermissionDenied()
if form is None: if form is None:
form = self.form_class(user=request.user, template=template) form = self.form_class(user=request.user, template=template)
else: else:
...@@ -1020,33 +1029,21 @@ class VmCreate(LoginRequiredMixin, TemplateView): ...@@ -1020,33 +1029,21 @@ class VmCreate(LoginRequiredMixin, TemplateView):
}) })
return self.render_to_response(context) return self.render_to_response(context)
def __create_normal(self, request, *args, **kwargs): def __create_normal(self, request, template, *args, **kwargs):
user = request.user instances = [Instance.create_from_template(
template = InstanceTemplate.objects.get( template=template,
pk=request.POST.get("template")) owner=request.user)]
# permission check
if not template.has_level(request.user, 'user'):
raise PermissionDenied()
args = {"template": template, "owner": user}
instances = [Instance.create_from_template(**args)]
return self.__deploy(request, instances) return self.__deploy(request, instances)
def __create_customized(self, request, *args, **kwargs): def __create_customized(self, request, template, *args, **kwargs):
user = request.user user = request.user
# no form yet, using POST directly: # no form yet, using POST directly:
template = get_object_or_404(InstanceTemplate,
pk=request.POST.get("template"))
form = self.form_class( form = self.form_class(
request.POST, user=request.user, template=template) request.POST, user=request.user, template=template)
if not form.is_valid(): if not form.is_valid():
return self.get(request, form, *args, **kwargs) return self.get(request, form, *args, **kwargs)
post = form.cleaned_data post = form.cleaned_data
if not template.has_level(user, 'user'):
raise PermissionDenied()
ikwargs = { ikwargs = {
'name': post['name'], 'name': post['name'],
'template': template, 'template': template,
...@@ -1099,6 +1096,8 @@ class VmCreate(LoginRequiredMixin, TemplateView): ...@@ -1099,6 +1096,8 @@ class VmCreate(LoginRequiredMixin, TemplateView):
if not request.user.has_perm('vm.create_vm'): if not request.user.has_perm('vm.create_vm'):
raise PermissionDenied() raise PermissionDenied()
template = self.get_template(request, request.POST.get("template"))
# limit chekcs # limit chekcs
try: try:
limit = user.profile.instance_limit limit = user.profile.instance_limit
...@@ -1124,7 +1123,7 @@ class VmCreate(LoginRequiredMixin, TemplateView): ...@@ -1124,7 +1123,7 @@ class VmCreate(LoginRequiredMixin, TemplateView):
request.POST.get("customized") is None else request.POST.get("customized") is None else
self.__create_customized) self.__create_customized)
return create_func(request, *args, **kwargs) return create_func(request, template, *args, **kwargs)
@require_GET @require_GET
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment