dashboard: remove InterfaceDeleteVie

circle/dashboard/forms.py

@@ -908,6 +908,36 @@ class VmDownloadDiskForm(OperationForm):
         return cleaned_data
         return cleaned_data
 
 
 
 
+class VmRemoveInterfaceForm(OperationForm):
+    def __init__(self, *args, **kwargs):
+        choices = kwargs.pop('choices')
+        self.interface = kwargs.pop('default')
+
+        super(VmRemoveInterfaceForm, self).__init__(*args, **kwargs)
+
+        self.fields.insert(0, 'interface', forms.ModelChoiceField(
+            queryset=choices, initial=self.interface, required=True,
+            empty_label=None, label=_('Interface')))
+        if self.interface:
+            self.fields['interface'].widget = HiddenInput()
+
+    @property
+    def helper(self):
+        helper = super(VmRemoveInterfaceForm, self).helper
+        print 'hi'
+        if self.interface:
+            helper.layout = Layout(
+                AnyTag(
+                    "div",
+                    HTML(format_html(
+                        _("<label>Vlan:</label> {0}"),
+                        self.interface.vlan)),
+                    css_class="form-group",
+                ),
+            )
+        return helper
+
+
 class VmAddInterfaceForm(OperationForm):
 class VmAddInterfaceForm(OperationForm):
     def __init__(self, *args, **kwargs):
     def __init__(self, *args, **kwargs):
         choices = kwargs.pop('choices')
         choices = kwargs.pop('choices')

circle/dashboard/static/dashboard/vm-details.js

@@ -168,35 +168,6 @@ $(function() {
     return false;
     return false;
   });
   });
 
 
-  /* for interface remove buttons */
-  $('.interface-remove').click(function() {
-    var interface_pk = $(this).data('interface-pk');
-    addModalConfirmation(removeInterface,
-      { 'url': '/dashboard/interface/' + interface_pk + '/delete/',
-        'data': [],
-        'pk': interface_pk,
-	'type': "interface",
-      });
-    return false;
-  });
-
-  /* removing interface post */
-  function removeInterface(data) {
-    $.ajax({
-      type: 'POST',
-      url: data.url,
-      headers: {"X-CSRFToken": getCookie('csrftoken')},
-      success: function(re, textStatus, xhr) {
-        /* remove the html element */
-        $('a[data-interface-pk="' + data.pk + '"]').closest("div").fadeOut();
-        location.reload();
-      },
-      error: function(xhr, textStatus, error) {
-        addMessage('Uh oh :(', 'danger');
-      }
-    });
-  }
-
   /* rename */
   /* rename */
   $("#vm-details-h1-name, .vm-details-rename-button").click(function() {
   $("#vm-details-h1-name, .vm-details-rename-button").click(function() {
     $("#vm-details-h1-name").hide();
     $("#vm-details-h1-name").hide();

circle/dashboard/templates/dashboard/vm-detail/network.html

@@ -21,13 +21,14 @@
       <a href="{{ i.host.get_absolute_url }}"
       <a href="{{ i.host.get_absolute_url }}"
         class="btn btn-default btn-xs">{% trans "edit" %}</a>
         class="btn btn-default btn-xs">{% trans "edit" %}</a>
     {% endif %}
     {% endif %}
-    {% if is_owner %}
-      <a href="{% url "dashboard.views.interface-delete" pk=i.pk %}?next={{ request.path }}"
-        class="btn btn-danger btn-xs interface-remove"
-        data-interface-pk="{{ i.pk }}">
-        {% trans "remove" %}
+    {% with op=op.remove_interface %}{% if op %}
+    <span class="operation-wrapper">
+      <a href="{{op.get_url}}?interface={{ i.pk }}"
+         class="btn btn-{{op.effect}} btn-xs operation interface-remove"
+         {% if op.disabled %}disabled{% endif %}>{% trans "remove" %}
       </a>
       </a>
-    {% endif %}
+    </span>
+    {% endif %}{% endwith %}
   </h3>
   </h3>
   {% if i.host %}
   {% if i.host %}
     <div class="row">
     <div class="row">

circle/dashboard/urls.py

@@ -30,7 +30,7 @@ from .views import (
     TemplateDelete, TemplateDetail, TemplateList,
     TemplateDelete, TemplateDetail, TemplateList,
     vm_activity, VmCreate, VmDetailView,
     vm_activity, VmCreate, VmDetailView,
     VmDetailVncTokenView, VmList,
     VmDetailVncTokenView, VmList,
-    DiskRemoveView, get_disk_download_status, InterfaceDeleteView,
+    DiskRemoveView, get_disk_download_status,
     GroupRemoveUserView,
     GroupRemoveUserView,
     GroupRemoveFutureUserView,
     GroupRemoveFutureUserView,
     GroupCreate, GroupProfileUpdate,
     GroupCreate, GroupProfileUpdate,
@@ -154,9 +154,6 @@ urlpatterns = patterns(
     url(r'^disk/(?P<pk>\d+)/status/$', get_disk_download_status,
     url(r'^disk/(?P<pk>\d+)/status/$', get_disk_download_status,
         name="dashboard.views.disk-status"),
         name="dashboard.views.disk-status"),
 
 
-    url(r'^interface/(?P<pk>\d+)/delete/$', InterfaceDeleteView.as_view(),
-        name="dashboard.views.interface-delete"),
-
     url(r'^profile/$', MyPreferencesView.as_view(),
     url(r'^profile/$', MyPreferencesView.as_view(),
         name="dashboard.views.profile-preferences"),
         name="dashboard.views.profile-preferences"),
     url(r'^subscribe/(?P<token>.*)/$', UnsubscribeFormView.as_view(),
     url(r'^subscribe/(?P<token>.*)/$', UnsubscribeFormView.as_view(),

circle/dashboard/views/vm.py

@@ -37,7 +37,7 @@ from django.utils.translation import (
 )
 )
 from django.views.decorators.http import require_GET
 from django.views.decorators.http import require_GET
 from django.views.generic import (
 from django.views.generic import (
-    UpdateView, ListView, TemplateView, DeleteView
+    UpdateView, ListView, TemplateView
 )
 )
 
 
 from braces.views import SuperuserRequiredMixin, LoginRequiredMixin
 from braces.views import SuperuserRequiredMixin, LoginRequiredMixin
@@ -64,6 +64,7 @@ from ..forms import (
     VmDiskResizeForm, RedeployForm, VmDiskRemoveForm,
     VmDiskResizeForm, RedeployForm, VmDiskRemoveForm,
     VmMigrateForm, VmDeployForm,
     VmMigrateForm, VmDeployForm,
     VmPortRemoveForm, VmPortAddForm,
     VmPortRemoveForm, VmPortAddForm,
+    VmRemoveInterfaceForm,
 )
 )
 from ..models import Favourite
 from ..models import Favourite
 
 
@@ -324,6 +325,32 @@ def get_operations(instance, user):
     return ops
     return ops
 
 
 
 
+class VmRemoveInterfaceView(FormOperationMixin, VmOperationView):
+    op = 'remove_interface'
+    form_class = VmRemoveInterfaceForm
+    show_in_toolbar = False
+    wait_for_result = 0.5
+    icon = 'times'
+    effect = "danger"
+    with_reload = True
+
+    def get_form_kwargs(self):
+        instance = self.get_op().instance
+        choices = instance.interface_set.all()
+        interface_pk = self.request.GET.get('interface')
+        if interface_pk:
+            try:
+                default = choices.get(pk=interface_pk)
+            except (ValueError, Interface.DoesNotExist):
+                raise Http404()
+        else:
+            default = None
+
+        val = super(VmRemoveInterfaceView, self).get_form_kwargs()
+        val.update({'choices': choices, 'default': default})
+        return val
+
+
 class VmAddInterfaceView(FormOperationMixin, VmOperationView):
 class VmAddInterfaceView(FormOperationMixin, VmOperationView):
 
 
     op = 'add_interface'
     op = 'add_interface'
@@ -707,6 +734,7 @@ vm_ops = OrderedDict([
         op='remove_disk', form_class=VmDiskRemoveForm,
         op='remove_disk', form_class=VmDiskRemoveForm,
         icon='times', effect="danger")),
         icon='times', effect="danger")),
     ('add_interface', VmAddInterfaceView),
     ('add_interface', VmAddInterfaceView),
+    ('remove_interface', VmRemoveInterfaceView),
     ('remove_port', VmPortRemoveView),
     ('remove_port', VmPortRemoveView),
     ('add_port', VmPortAddView),
     ('add_port', VmPortAddView),
     ('renew', VmRenewView),
     ('renew', VmRenewView),
@@ -1111,56 +1139,6 @@ def get_vm_screenshot(request, pk):
     return HttpResponse(image, mimetype="image/png")
     return HttpResponse(image, mimetype="image/png")
 
 
 
 
-class InterfaceDeleteView(DeleteView):
-    model = Interface
-
-    def get_template_names(self):
-        if self.request.is_ajax():
-            return ['dashboard/confirm/ajax-delete.html']
-        else:
-            return ['dashboard/confirm/base-delete.html']
-
-    def get_context_data(self, **kwargs):
-        context = super(InterfaceDeleteView, self).get_context_data(**kwargs)
-        interface = self.get_object()
-        context['text'] = _("Are you sure you want to remove this interface "
-                            "from <strong>%(vm)s</strong>?" %
-                            {'vm': interface.instance.name})
-        return context
-
-    def delete(self, request, *args, **kwargs):
-        self.object = self.get_object()
-        instance = self.object.instance
-
-        if not instance.has_level(request.user, "owner"):
-            raise PermissionDenied()
-
-        instance.remove_interface(interface=self.object, user=request.user)
-        success_url = self.get_success_url()
-        success_message = _("Interface successfully deleted.")
-
-        if request.is_ajax():
-            return HttpResponse(
-                json.dumps(
-                    {'message': success_message,
-                     'removed_network': {
-                         'vlan': self.object.vlan.name,
-                         'vlan_pk': self.object.vlan.pk,
-                         'managed': self.object.host is not None,
-                     }}),
-                content_type="application/json",
-            )
-        else:
-            messages.success(request, success_message)
-            return HttpResponseRedirect("%s#network" % success_url)
-
-    def get_success_url(self):
-        redirect = self.request.POST.get("next")
-        if redirect:
-            return redirect
-        self.object.instance.get_absolute_url()
-
-
 class InstanceActivityDetail(CheckedDetailView):
 class InstanceActivityDetail(CheckedDetailView):
     model = InstanceActivity
     model = InstanceActivity
     context_object_name = 'instanceactivity'  # much simpler to mock object
     context_object_name = 'instanceactivity'  # much simpler to mock object