diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index f9dec9f69..3908b35af 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -16,9 +16,9 @@ from utilities.forms import ( from .models import ( DeviceBay, DeviceBayTemplate, CONNECTION_STATUS_CHOICES, CONNECTION_STATUS_PLANNED, CONNECTION_STATUS_CONNECTED, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device, DeviceRole, DeviceType, - Interface, IFACE_FF_VIRTUAL, InterfaceConnection, InterfaceTemplate, Manufacturer, Module, Platform, PowerOutlet, - PowerOutletTemplate, PowerPort, PowerPortTemplate, RACK_TYPE_CHOICES, RACK_WIDTH_CHOICES, Rack, RackGroup, RackRole, - Site, STATUS_CHOICES, SUBDEVICE_ROLE_CHILD + Interface, IFACE_FF_CHOICES, IFACE_FF_VIRTUAL, InterfaceConnection, InterfaceTemplate, Manufacturer, Module, + Platform, PowerOutlet, PowerOutletTemplate, PowerPort, PowerPortTemplate, RACK_TYPE_CHOICES, RACK_WIDTH_CHOICES, + Rack, RackGroup, RackRole, Site, STATUS_CHOICES, SUBDEVICE_ROLE_CHILD ) @@ -1008,6 +1008,15 @@ class InterfaceBulkCreateForm(InterfaceCreateForm, BootstrapMixin): pk = forms.ModelMultipleChoiceField(queryset=Device.objects.all(), widget=forms.MultipleHiddenInput) +class InterfaceBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm): + pk = forms.ModelMultipleChoiceField(queryset=Interface.objects.all(), widget=forms.MultipleHiddenInput) + form_factor = forms.ChoiceField(choices=add_blank_choice(IFACE_FF_CHOICES), required=False) + description = forms.CharField(max_length=100, required=False) + + class Meta: + nullable_fields = ['description'] + + # # Interface connections # diff --git a/netbox/dcim/urls.py b/netbox/dcim/urls.py index dfeb06467..f5c5f69c0 100644 --- a/netbox/dcim/urls.py +++ b/netbox/dcim/urls.py @@ -3,10 +3,6 @@ from django.conf.urls import url from secrets.views import secret_add from . import views -from .models import ( - ConsolePortTemplate, ConsoleServerPortTemplate, DeviceBayTemplate, PowerPortTemplate, PowerOutletTemplate, - InterfaceTemplate, -) urlpatterns = [ @@ -159,6 +155,7 @@ urlpatterns = [ # Interfaces url(r'^devices/interfaces/add/$', views.InterfaceBulkAddView.as_view(), name='interface_add_multi'), url(r'^devices/(?P\d+)/interfaces/add/$', views.interface_add, name='interface_add'), + url(r'^devices/(?P\d+)/interfaces/edit/$', views.InterfaceBulkEditView.as_view(), name='interface_bulk_edit'), url(r'^devices/(?P\d+)/interfaces/delete/$', views.InterfaceBulkDeleteView.as_view(), name='interface_bulk_delete'), url(r'^devices/(?P\d+)/interface-connections/add/$', views.interfaceconnection_add, name='interfaceconnection_add'), url(r'^interface-connections/(?P\d+)/delete/$', views.interfaceconnection_delete, name='interfaceconnection_delete'), diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 44b39573c..112734c22 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1425,6 +1425,14 @@ class InterfaceBulkAddView(PermissionRequiredMixin, BulkEditView): len(selected_devices))) +class InterfaceBulkEditView(PermissionRequiredMixin, BulkEditView): + permission_required = 'dcim.change_interface' + cls = Interface + parent_cls = Device + form = forms.InterfaceBulkEditForm + template_name = 'dcim/interface_bulk_edit.html' + + class InterfaceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_interface' cls = Interface diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 673c25c59..98f43be19 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -355,7 +355,7 @@ {% endif %} {% if interfaces or device.device_type.is_network_device %} {% if perms.dcim.delete_interface %} -
+ {% csrf_token %} {% endif %}
@@ -380,8 +380,13 @@ {% if perms.dcim.add_interface or perms.dcim.delete_interface %}
+ {% if interfaces and perms.dcim.change_interface %} + + {% endif %} {% if interfaces and perms.dcim.delete_interface %} - {% endif %} diff --git a/netbox/templates/dcim/interface_bulk_edit.html b/netbox/templates/dcim/interface_bulk_edit.html new file mode 100644 index 000000000..7b25abb4d --- /dev/null +++ b/netbox/templates/dcim/interface_bulk_edit.html @@ -0,0 +1,17 @@ +{% extends 'utilities/bulk_edit_form.html' %} +{% load form_helpers %} + +{% block title %}Interface Bulk Edit{% endblock %} + +{% block selected_objects_table %} + + Name + Form Factor + + {% for iface in selected_objects %} + + {{ iface.name }} + {{ iface.get_form_factor_display }} + + {% endfor %} +{% endblock %} diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 13173642a..0a4337732 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -34,7 +34,7 @@ def add_blank_choice(choices): """ Add a blank choice to the beginning of a choices list. """ - return ((None, '---------'),) + choices + return ((None, '---------'),) + tuple(choices) # diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index 4e3637ee0..7b47e76e1 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -280,21 +280,34 @@ class BulkImportView(View): class BulkEditView(View): cls = None + parent_cls = None form = None template_name = None default_redirect_url = None - def get(self, request, *args, **kwargs): + def get(self): return redirect(self.default_redirect_url) - def post(self, request, *args, **kwargs): + def post(self, request, **kwargs): + # Attempt to derive parent object if a parent class has been given + if self.parent_cls: + parent_obj = get_object_or_404(self.parent_cls, **kwargs) + else: + parent_obj = None + + # Determine URL to redirect users upon modification of objects posted_redirect_url = request.POST.get('redirect_url') if posted_redirect_url and is_safe_url(url=posted_redirect_url, host=request.get_host()): redirect_url = posted_redirect_url - else: + elif parent_obj: + redirect_url = parent_obj.get_absolute_url() + elif self.default_redirect_url: redirect_url = reverse(self.default_redirect_url) + else: + raise ImproperlyConfigured('No redirect URL has been provided.') + # Are we editing *all* objects in the queryset or just a selected subset? if request.POST.get('_all'): pk_list = [int(pk) for pk in request.POST.get('pk_all').split(',') if pk] else: @@ -398,7 +411,7 @@ class BulkDeleteView(View): template_name = 'utilities/confirm_bulk_delete.html' default_redirect_url = None - def post(self, request, *args, **kwargs): + def post(self, request, **kwargs): # Attempt to derive parent object if a parent class has been given if self.parent_cls: @@ -419,9 +432,9 @@ class BulkDeleteView(View): # Are we deleting *all* objects in the queryset or just a selected subset? if request.POST.get('_all'): - pk_list = [x for x in request.POST.get('pk_all').split(',') if x] + pk_list = [int(pk) for pk in request.POST.get('pk_all').split(',') if pk] else: - pk_list = request.POST.getlist('pk') + pk_list = [int(pk) for pk in request.POST.getlist('pk')] form_cls = self.get_form()