dashboard: remove mass delete

circle/dashboard/tests/test_views.py

@@ -107,20 +107,6 @@ class VmDetailTest(LoginMixin, TestCase):
         response = c.get('/dashboard/vm/1/')
         response = c.get('/dashboard/vm/1/')
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.status_code, 200)
 
 
-    def test_unpermitted_vm_mass_delete(self):
-        c = Client()
-        self.login(c, 'user1')
-        response = c.post('/dashboard/vm/mass-delete/', {'vms': [1]})
-        self.assertEqual(response.status_code, 403)
-
-    def test_permitted_vm_mass_delete(self):
-        c = Client()
-        self.login(c, 'user2')
-        inst = Instance.objects.get(pk=1)
-        inst.set_level(self.u2, 'owner')
-        response = c.post('/dashboard/vm/mass-delete/', {'vms': [1]})
-        self.assertEqual(response.status_code, 302)
-
     def test_unpermitted_password_change(self):
     def test_unpermitted_password_change(self):
         c = Client()
         c = Client()
         self.login(c, "user2")
         self.login(c, "user2")

circle/dashboard/urls.py

@@ -29,7 +29,7 @@ from .views import (
     NotificationView, PortDelete, TemplateAclUpdateView, TemplateCreate,
     NotificationView, PortDelete, TemplateAclUpdateView, TemplateCreate,
     TemplateDelete, TemplateDetail, TemplateList, TransferOwnershipConfirmView,
     TemplateDelete, TemplateDetail, TemplateList, TransferOwnershipConfirmView,
     TransferOwnershipView, vm_activity, VmCreate, VmDetailView,
     TransferOwnershipView, vm_activity, VmCreate, VmDetailView,
-    VmDetailVncTokenView, VmGraphView, VmList, VmMassDelete,
+    VmDetailVncTokenView, VmGraphView, VmList,
     DiskRemoveView, get_disk_download_status, InterfaceDeleteView,
     DiskRemoveView, get_disk_download_status, InterfaceDeleteView,
     GroupRemoveUserView,
     GroupRemoveUserView,
     GroupRemoveFutureUserView,
     GroupRemoveFutureUserView,
@@ -87,8 +87,6 @@ urlpatterns = patterns(
     url(r'^vm/list/$', VmList.as_view(), name='dashboard.views.vm-list'),
     url(r'^vm/list/$', VmList.as_view(), name='dashboard.views.vm-list'),
     url(r'^vm/create/$', VmCreate.as_view(),
     url(r'^vm/create/$', VmCreate.as_view(),
         name='dashboard.views.vm-create'),
         name='dashboard.views.vm-create'),
-    url(r'^vm/mass-delete/', VmMassDelete.as_view(),
-        name='dashboard.view.mass-delete-vm'),
     url(r'^vm/(?P<pk>\d+)/activity/$', vm_activity),
     url(r'^vm/(?P<pk>\d+)/activity/$', vm_activity),
     url(r'^vm/activity/(?P<pk>\d+)/$', InstanceActivityDetail.as_view(),
     url(r'^vm/activity/(?P<pk>\d+)/$', InstanceActivityDetail.as_view(),
         name='dashboard.views.vm-activity'),
         name='dashboard.views.vm-activity'),

circle/dashboard/views.py

@@ -2468,48 +2468,6 @@ class PortDelete(LoginRequiredMixin, DeleteView):
                             kwargs={'pk': self.kwargs.get("pk")})
                             kwargs={'pk': self.kwargs.get("pk")})
 
 
 
 
-class VmMassDelete(LoginRequiredMixin, View):
-    def get(self, request, *args, **kwargs):
-        vms = request.GET.getlist('v[]')
-        objects = Instance.objects.filter(pk__in=vms)
-        return render(request, "dashboard/confirm/mass-delete.html",
-                      {'objects': objects})
-
-    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))
-                    # no need for rollback or proper error message, this can't
-                    # normally happen:
-                    raise PermissionDenied()
-                try:
-                    i.destroy.async(user=request.user)
-                    names.append(i.name)
-                except Exception as e:
-                    logger.error(e)
-
-        success_message = ungettext_lazy(
-            "Mass delete complete, the following VM was deleted: %s.",
-            "Mass delete complete, the following VMs were deleted: %s.",
-            len(names)) % 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'))
-
-
 class LeaseCreate(LoginRequiredMixin, PermissionRequiredMixin,
 class LeaseCreate(LoginRequiredMixin, PermissionRequiredMixin,
                   SuccessMessageMixin, CreateView):
                   SuccessMessageMixin, CreateView):
     model = Lease
     model = Lease