dashboard: remove interface function

circle/dashboard/static/dashboard/dashboard.js

@@ -303,7 +303,11 @@ function deleteObject(data) {
           // no need to remove them from DOM
           // no need to remove them from DOM
           $('a[data-disk-pk="' + data.pk + '"]').parent("li").fadeOut();
           $('a[data-disk-pk="' + data.pk + '"]').parent("li").fadeOut();
           $('a[data-disk-pk="' + data.pk + '"]').parent("h4").fadeOut();
           $('a[data-disk-pk="' + data.pk + '"]').parent("h4").fadeOut();
-        } else { 
+        } 
+        else if(data.type === "interface") {
+          $('a[data-interface-pk="' + data.pk + '"]').closest("div").fadeOut();
+        }
+        else { 
           $('a[data-'+data['type']+'-pk="' + data['pk'] + '"]').closest('tr').fadeOut(function() {
           $('a[data-'+data['type']+'-pk="' + data['pk'] + '"]').closest('tr').fadeOut(function() {
             $(this).remove();  
             $(this).remove();  
           });
           });

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

@@ -165,6 +165,19 @@ $(function() {
   $(".vm-details-help-button").click(function() {
   $(".vm-details-help-button").click(function() {
     $(".vm-details-help").stop().slideToggle();
     $(".vm-details-help").stop().slideToggle();
   });
   });
+
+
+  /* for interface remove buttons */
+  $('.interface-remove').click(function() {
+    var interface_pk = $(this).data('interface-pk');
+    addModalConfirmation(deleteObject, 
+      { 'url': '/dashboard/interface/' + interface_pk + '/delete/',
+        'data': [],
+        'pk': interface_pk,
+	'type': "interface",
+      });
+    return false;
+  });
 });
 });
 
 
 
 

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

@@ -10,9 +10,14 @@
 
 
 </div>
 </div>
 {% for i in instance.interface_set.all %}
 {% for i in instance.interface_set.all %}
+<div>
   <h3 class="list-group-item-heading dashboard-vm-details-network-h3">
   <h3 class="list-group-item-heading dashboard-vm-details-network-h3">
     <i class="icon-{% if i.host %}globe{% else %}link{% endif %}"></i> {{ i.vlan.name }} 
     <i class="icon-{% if i.host %}globe{% else %}link{% endif %}"></i> {{ i.vlan.name }} 
-    {% if not i.host %}(unmanaged) <a href="#" class="btn btn-danger btn-xs">{% trans "remove" %}</a>{% endif %}
+    {% if not i.host%}({% trans "unmanaged" %}){% endif %}
+    <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" %}
+    </a>
   </h3>
   </h3>
   {% if i.host %}
   {% if i.host %}
     <div class="row">
     <div class="row">
@@ -109,6 +114,7 @@
       </div>
       </div>
     </div>
     </div>
   {% endif %}
   {% endif %}
+</div>
 {% endfor %}
 {% endfor %}
 <div class="js-hidden row" id="vm-details-network-add-form">
 <div class="js-hidden row" id="vm-details-network-add-form">
   <div class="col-md-12">
   <div class="col-md-12">

circle/dashboard/urls.py

@@ -11,7 +11,7 @@ from .views import (
     TemplateDelete, TemplateDetail, TemplateList, TransferOwnershipConfirmView,
     TemplateDelete, TemplateDetail, TemplateList, TransferOwnershipConfirmView,
     TransferOwnershipView, vm_activity, VmCreate, VmDelete, VmDetailView,
     TransferOwnershipView, vm_activity, VmCreate, VmDelete, VmDetailView,
     VmDetailVncTokenView, VmGraphView, VmList, VmMassDelete, VmMigrateView,
     VmDetailVncTokenView, VmGraphView, VmList, VmMassDelete, VmMigrateView,
-    VmRenewView, DiskRemoveView, get_disk_download_status,
+    VmRenewView, DiskRemoveView, get_disk_download_status, InterfaceDeleteView,
 )
 )
 
 
 urlpatterns = patterns(
 urlpatterns = patterns(
@@ -107,6 +107,9 @@ 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"),
         name="dashboard.views.profile"),
 )
 )

circle/dashboard/views.py

@@ -2203,3 +2203,43 @@ class InstanceActivityDetail(SuperuserRequiredMixin, DetailView):
             order_by('-started').select_related('user').
             order_by('-started').select_related('user').
             prefetch_related('children'))
             prefetch_related('children'))
         return ctx
         return ctx
+
+
+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()
+
+        self.object.destroy()
+        success_url = self.get_success_url()
+        success_message = _("Interface successfully deleted!")
+
+        if request.is_ajax():
+            return HttpResponse(
+                json.dumps({'message': success_message}),
+                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()