From 93ba646f80e70f3604a6a805d89736a69b4ae723 Mon Sep 17 00:00:00 2001 From: Bach Dániel <bd@ik.bme.hu> Date: Fri, 4 Jul 2014 08:06:48 +0200 Subject: [PATCH] dashboard: remove VmMigrateView from urls --- circle/dashboard/urls.py | 4 +--- circle/dashboard/views.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/circle/dashboard/urls.py b/circle/dashboard/urls.py index f5d30a6..8fa1360 100644 --- a/circle/dashboard/urls.py +++ b/circle/dashboard/urls.py @@ -28,7 +28,7 @@ from .views import ( NotificationView, PortDelete, TemplateAclUpdateView, TemplateCreate, TemplateDelete, TemplateDetail, TemplateList, TransferOwnershipConfirmView, TransferOwnershipView, vm_activity, VmCreate, VmDelete, VmDetailView, - VmDetailVncTokenView, VmGraphView, VmList, VmMassDelete, VmMigrateView, + VmDetailVncTokenView, VmGraphView, VmList, VmMassDelete, VmRenewView, DiskRemoveView, get_disk_download_status, InterfaceDeleteView, GroupRemoveAclUserView, GroupRemoveAclGroupView, GroupRemoveUserView, GroupCreate, GroupProfileUpdate, @@ -82,8 +82,6 @@ urlpatterns = patterns( 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+)/migrate/$', VmMigrateView.as_view(), - name='dashboard.views.vm-migrate'), url(r'^vm/(?P<pk>\d+)/renew/((?P<key>.*)/?)$', VmRenewView.as_view(), name='dashboard.views.vm-renew'), url(r'^vm/activity/(?P<pk>\d+)/$', InstanceActivityDetail.as_view(), diff --git a/circle/dashboard/views.py b/circle/dashboard/views.py index 5029cef..eee09b6 100644 --- a/circle/dashboard/views.py +++ b/circle/dashboard/views.py @@ -639,7 +639,7 @@ class VmDownloadDiskView(FormOperationMixin, VmOperationView): is_disk_operation = True -class VmMigrateView(SuperuserRequiredMixin, VmOperationView): +class VmMigrateView(VmOperationView): op = 'migrate' icon = 'truck' -- libgit2 0.26.0