dashboard: mass delete as generic View

circle/dashboard/urls.py

@@ -3,7 +3,7 @@ from django.conf.urls import patterns, url
 from vm.models import Instance
 from vm.models import Instance
 from .views import (
 from .views import (
     IndexView, VmDetailView, VmList, VmCreate, TemplateDetail, AclUpdateView,
     IndexView, VmDetailView, VmList, VmCreate, TemplateDetail, AclUpdateView,
-    VmDelete, mass_delete_vm, vm_activity)
+    VmDelete, VmMassDelete, vm_activity)
 
 
 urlpatterns = patterns(
 urlpatterns = patterns(
     '',
     '',
@@ -19,7 +19,7 @@ urlpatterns = patterns(
         name='dashboard.views.vm-create'),
         name='dashboard.views.vm-create'),
     url(r'^vm/delete/(?P<pk>\d+)/$', VmDelete.as_view(),
     url(r'^vm/delete/(?P<pk>\d+)/$', VmDelete.as_view(),
         name="dashboard.views.delete-vm"),
         name="dashboard.views.delete-vm"),
-    url(r'^vm/mass-delete/', mass_delete_vm,
+    url(r'^vm/mass-delete/', VmMassDelete.as_view(),
         name='dashboard.view.mass-delete-vm'),
         name='dashboard.view.mass-delete-vm'),
     url(r'^vm/(?P<pk>\d+)/activity/$', vm_activity)
     url(r'^vm/(?P<pk>\d+)/activity/$', vm_activity)
 )
 )

circle/dashboard/views.py

@@ -332,39 +332,41 @@ class VmDelete(DeleteView):
             return reverse_lazy('dashboard.index')
             return reverse_lazy('dashboard.index')
 
 
 
 
-def mass_delete_vm(request, **kwargs):
-    if request.method == "GET":
+class VmMassDelete(View):
+    def get(self, request, *args, **kwargs):
         vms = request.GET.getlist('v[]')
         vms = request.GET.getlist('v[]')
         objects = Instance.objects.filter(pk__in=vms)
         objects = Instance.objects.filter(pk__in=vms)
         return render(request, "dashboard/confirm/mass-delete.html",
         return render(request, "dashboard/confirm/mass-delete.html",
                       {'objects': objects})
                       {'objects': objects})
 
 
-    vms = request.POST.getlist('vms')
-    names = []
-    if vms is not None:
-        for i in Instance.objects.filter(pk__in=vms):
-            if not i.has_level(request.user, 'owner'):
-                logger.info('Tried to delete instance #%d without owner '
-                            'permission by %s.', i.pk, unicode(request.user))
-                raise PermissionDenied()  # no need for rollback or proper
-                                          # error message, this can't
-                                          # normally happen.
-            i.destroy_async(request.user)
-            names.append(i.name)
-
-    success_message = _("Mass delete complete, the following VMs were " +
-                        "deleted: %s!" % u', '.join(names))
-
-    # we can get this only via AJAX ...
-    if request.is_ajax():
-        return HttpResponse(
-            json.dumps({'message': success_message}),
-            content_type="application/json"
-        )
-    else:
-        messages.success(request, success_message)
-        next = request.GET.get('next')
-        return redirect(next if next else reverse_lazy('dashboard.index'))
+    def post(self, request, *args, **kwargs):
+        vms = request.POST.getlist('vms')
+        names = []
+        if vms is not None:
+            for i in Instance.objects.filter(pk__in=vms):
+                if not i.has_level(request.user, 'owner'):
+                    logger.info('Tried to delete instance #%d without owner '
+                                'permission by %s.', i.pk,
+                                unicode(request.user))
+                    raise PermissionDenied()  # no need for rollback or proper
+                                            # error message, this can't
+                                            # normally happen.
+                i.destroy_async(request.user)
+                names.append(i.name)
+
+        success_message = _("Mass delete complete, the following VMs were " +
+                            "deleted: %s!" % u', '.join(names))
+
+        # we can get this only via AJAX ...
+        if request.is_ajax():
+            return HttpResponse(
+                json.dumps({'message': success_message}),
+                content_type="application/json"
+            )
+        else:
+            messages.success(request, success_message)
+            next = request.GET.get('next')
+            return redirect(next if next else reverse_lazy('dashboard.index'))
 
 
 
 
 @require_POST
 @require_POST