diff --git a/netbox/circuits/api/urls.py b/netbox/circuits/api/urls.py index ef45b07ed..afc034141 100644 --- a/netbox/circuits/api/urls.py +++ b/netbox/circuits/api/urls.py @@ -11,7 +11,8 @@ urlpatterns = [ # Providers url(r'^providers/$', ProviderListView.as_view(), name='provider_list'), url(r'^providers/(?P\d+)/$', ProviderDetailView.as_view(), name='provider_detail'), - url(r'^providers/(?P\d+)/graphs/$', GraphListView.as_view(), {'type': GRAPH_TYPE_PROVIDER}, name='provider_graphs'), + url(r'^providers/(?P\d+)/graphs/$', GraphListView.as_view(), {'type': GRAPH_TYPE_PROVIDER}, + name='provider_graphs'), # Circuit types url(r'^circuit-types/$', CircuitTypeListView.as_view(), name='circuittype_list'), diff --git a/netbox/circuits/api/views.py b/netbox/circuits/api/views.py index 834c9b957..d2d368302 100644 --- a/netbox/circuits/api/views.py +++ b/netbox/circuits/api/views.py @@ -2,7 +2,8 @@ from rest_framework import generics from circuits.models import Provider, CircuitType, Circuit from circuits.filters import CircuitFilter -from .serializers import ProviderSerializer, CircuitTypeSerializer, CircuitSerializer + +from . import serializers class ProviderListView(generics.ListAPIView): @@ -10,7 +11,7 @@ class ProviderListView(generics.ListAPIView): List all providers """ queryset = Provider.objects.all() - serializer_class = ProviderSerializer + serializer_class = serializers.ProviderSerializer class ProviderDetailView(generics.RetrieveAPIView): @@ -18,7 +19,7 @@ class ProviderDetailView(generics.RetrieveAPIView): Retrieve a single provider """ queryset = Provider.objects.all() - serializer_class = ProviderSerializer + serializer_class = serializers.ProviderSerializer class CircuitTypeListView(generics.ListAPIView): @@ -26,7 +27,7 @@ class CircuitTypeListView(generics.ListAPIView): List all circuit types """ queryset = CircuitType.objects.all() - serializer_class = CircuitTypeSerializer + serializer_class = serializers.CircuitTypeSerializer class CircuitTypeDetailView(generics.RetrieveAPIView): @@ -34,7 +35,7 @@ class CircuitTypeDetailView(generics.RetrieveAPIView): Retrieve a single circuit type """ queryset = CircuitType.objects.all() - serializer_class = CircuitTypeSerializer + serializer_class = serializers.CircuitTypeSerializer class CircuitListView(generics.ListAPIView): @@ -42,7 +43,7 @@ class CircuitListView(generics.ListAPIView): List circuits (filterable) """ queryset = Circuit.objects.select_related('type', 'provider', 'site', 'interface__device') - serializer_class = CircuitSerializer + serializer_class = serializers.CircuitSerializer filter_class = CircuitFilter @@ -51,4 +52,4 @@ class CircuitDetailView(generics.RetrieveAPIView): Retrieve a single circuit """ queryset = Circuit.objects.select_related('type', 'provider', 'site', 'interface__device') - serializer_class = CircuitSerializer + serializer_class = serializers.CircuitSerializer diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index 009baae73..e92d94471 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -2,10 +2,11 @@ from django import forms from django.db.models import Count from dcim.models import Site, Device, Interface, Rack, IFACE_FF_VIRTUAL -from utilities.forms import BootstrapMixin, SmallTextarea, ConfirmationForm, APISelect, Livesearch +from utilities.forms import ( + APISelect, BootstrapMixin, BulkImportForm, CommentField, ConfirmationForm, CSVDataField, Livesearch, SmallTextarea, +) -from .models import PORT_SPEED_CHOICES, Circuit, Provider, CircuitType -from utilities.forms import CommentField, CSVDataField, BulkImportForm +from .models import PORT_SPEED_CHOICES, Circuit, CircuitType, Provider # diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py index 98c4a4455..cb63b02da 100644 --- a/netbox/circuits/tables.py +++ b/netbox/circuits/tables.py @@ -5,7 +5,9 @@ from .models import Circuit, CircuitType, Provider CIRCUITTYPE_EDIT_LINK = """ -{% if perms.circuit.change_circuittype %}Edit{% endif %} +{% if perms.circuit.change_circuittype %} + Edit +{% endif %} """ diff --git a/netbox/circuits/urls.py b/netbox/circuits/urls.py index 2e2b99bf7..9ecb1d5ae 100644 --- a/netbox/circuits/urls.py +++ b/netbox/circuits/urls.py @@ -2,6 +2,7 @@ from django.conf.urls import url from . import views + urlpatterns = [ # Providers diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 7fb866a18..6e41257c3 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -3,13 +3,12 @@ from django.contrib.auth.mixins import PermissionRequiredMixin from django.db.models import Count from django.shortcuts import get_object_or_404, render -from utilities.views import BulkImportView, BulkEditView, BulkDeleteView, ObjectListView, ObjectEditView,\ - ObjectDeleteView +from utilities.views import ( + BulkImportView, BulkEditView, BulkDeleteView, ObjectListView, ObjectEditView, ObjectDeleteView, +) +from . import forms from .filters import CircuitFilter -from .forms import CircuitTypeForm, CircuitTypeBulkDeleteForm, CircuitForm, CircuitImportForm, CircuitBulkEditForm,\ - CircuitBulkDeleteForm, CircuitFilterForm, ProviderForm, ProviderImportForm, ProviderBulkEditForm,\ - ProviderBulkDeleteForm from .models import Circuit, CircuitType, Provider from .tables import CircuitTable, CircuitTypeTable, ProviderTable @@ -39,7 +38,7 @@ def provider(request, slug): class ProviderEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'circuits.change_provider' model = Provider - form_class = ProviderForm + form_class = forms.ProviderForm template_name = 'circuits/provider_edit.html' cancel_url = 'circuits:provider_list' @@ -52,7 +51,7 @@ class ProviderDeleteView(PermissionRequiredMixin, ObjectDeleteView): class ProviderBulkImportView(PermissionRequiredMixin, BulkImportView): permission_required = 'circuits.add_provider' - form = ProviderImportForm + form = forms.ProviderImportForm table = ProviderTable template_name = 'circuits/provider_import.html' obj_list_url = 'circuits:provider_list' @@ -61,7 +60,7 @@ class ProviderBulkImportView(PermissionRequiredMixin, BulkImportView): class ProviderBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'circuits.change_provider' cls = Provider - form = ProviderBulkEditForm + form = forms.ProviderBulkEditForm template_name = 'circuits/provider_bulk_edit.html' default_redirect_url = 'circuits:provider_list' @@ -79,7 +78,7 @@ class ProviderBulkEditView(PermissionRequiredMixin, BulkEditView): class ProviderBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'circuits.delete_provider' cls = Provider - form = ProviderBulkDeleteForm + form = forms.ProviderBulkDeleteForm default_redirect_url = 'circuits:provider_list' @@ -97,7 +96,7 @@ class CircuitTypeListView(ObjectListView): class CircuitTypeEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'circuits.change_circuittype' model = CircuitType - form_class = CircuitTypeForm + form_class = forms.CircuitTypeForm success_url = 'circuits:circuittype_list' cancel_url = 'circuits:circuittype_list' @@ -105,7 +104,7 @@ class CircuitTypeEditView(PermissionRequiredMixin, ObjectEditView): class CircuitTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'circuits.delete_circuittype' cls = CircuitType - form = CircuitTypeBulkDeleteForm + form = forms.CircuitTypeBulkDeleteForm default_redirect_url = 'circuits:circuittype_list' @@ -116,7 +115,7 @@ class CircuitTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): class CircuitListView(ObjectListView): queryset = Circuit.objects.select_related('provider', 'type', 'site') filter = CircuitFilter - filter_form = CircuitFilterForm + filter_form = forms.CircuitFilterForm table = CircuitTable edit_permissions = ['circuits.change_circuit', 'circuits.delete_circuit'] template_name = 'circuits/circuit_list.html' @@ -134,7 +133,7 @@ def circuit(request, pk): class CircuitEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'circuits.change_circuit' model = Circuit - form_class = CircuitForm + form_class = forms.CircuitForm fields_initial = ['site'] template_name = 'circuits/circuit_edit.html' cancel_url = 'circuits:circuit_list' @@ -148,7 +147,7 @@ class CircuitDeleteView(PermissionRequiredMixin, ObjectDeleteView): class CircuitBulkImportView(PermissionRequiredMixin, BulkImportView): permission_required = 'circuits.add_circuit' - form = CircuitImportForm + form = forms.CircuitImportForm table = CircuitTable template_name = 'circuits/circuit_import.html' obj_list_url = 'circuits:circuit_list' @@ -157,7 +156,7 @@ class CircuitBulkImportView(PermissionRequiredMixin, BulkImportView): class CircuitBulkEditView(PermissionRequiredMixin, BulkEditView): permission_required = 'circuits.change_circuit' cls = Circuit - form = CircuitBulkEditForm + form = forms.CircuitBulkEditForm template_name = 'circuits/circuit_bulk_edit.html' default_redirect_url = 'circuits:circuit_list' @@ -175,5 +174,5 @@ class CircuitBulkEditView(PermissionRequiredMixin, BulkEditView): class CircuitBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'circuits.delete_circuit' cls = Circuit - form = CircuitBulkDeleteForm + form = forms.CircuitBulkDeleteForm default_redirect_url = 'circuits:circuit_list'