From 510bf5ca67700068b6b6b1c03ba6efa1b21d6968 Mon Sep 17 00:00:00 2001 From: Nathan Gotz Date: Wed, 14 Sep 2016 16:06:23 -0500 Subject: [PATCH] Fixed PEP8 issues with multipoint circuits --- netbox/circuits/admin.py | 3 ++- netbox/circuits/forms.py | 3 ++- netbox/circuits/models.py | 1 + netbox/circuits/tables.py | 3 +-- netbox/circuits/views.py | 3 +++ netbox/netbox/urls.py | 1 - 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/netbox/circuits/admin.py b/netbox/circuits/admin.py index 8a194a6e6..3e730682f 100644 --- a/netbox/circuits/admin.py +++ b/netbox/circuits/admin.py @@ -21,13 +21,14 @@ class CircuitTypeAdmin(admin.ModelAdmin): @admin.register(Circuit) class CircuitAdmin(admin.ModelAdmin): - list_display = ['cid', 'provider', 'type', 'tenant','install_date'] + list_display = ['cid', 'provider', 'type', 'tenant', 'install_date'] list_filter = ['provider', 'type', 'tenant'] def get_queryset(self, request): qs = super(CircuitAdmin, self).get_queryset(request) return qs.select_related('provider', 'type', 'tenant') + @admin.register(Termination) class TerminationAdmin(admin.ModelAdmin): list_display = ['tid', 'circuit', 'site', 'port_speed_human', diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index 677daa082..6db3076a4 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -150,6 +150,7 @@ class CircuitFilterForm(BootstrapMixin, CustomFieldFilterForm): tenant = forms.MultipleChoiceField(required=False, choices=circuit_tenant_choices, widget=forms.SelectMultiple(attrs={'size': 8})) + # # Terminations # @@ -197,7 +198,7 @@ class TerminationForm(BootstrapMixin, CustomFieldForm): model = Termination fields = [ 'tid', 'site', 'rack', 'device', 'livesearch', - 'interface','port_speed', 'upstream_speed', 'commit_rate', + 'interface', 'port_speed', 'upstream_speed', 'commit_rate', 'xconnect_id', 'pp_info', 'comments' ] help_texts = { diff --git a/netbox/circuits/models.py b/netbox/circuits/models.py index eb5e6af22..603e3b9e9 100644 --- a/netbox/circuits/models.py +++ b/netbox/circuits/models.py @@ -90,6 +90,7 @@ class Circuit(CreatedUpdatedModel): self.install_date.isoformat() if self.install_date else '', ]) + class Termination(CreatedUpdatedModel): """ A Termination is where a site diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py index 59f0f59b4..761583e16 100644 --- a/netbox/circuits/tables.py +++ b/netbox/circuits/tables.py @@ -57,8 +57,7 @@ class CircuitTable(BaseTable): provider = tables.LinkColumn('circuits:provider', args=[Accessor('provider.slug')], verbose_name='Provider') tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')], verbose_name='Tenant') termination_count = tables.Column(accessor=Accessor('count_terminations'), - verbose_name='Terminations') - + verbose_name='Terminations') class Meta(BaseTable.Meta): model = Circuit diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index b56acbc6b..08a468821 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -160,6 +160,7 @@ class CircuitBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): cls = Circuit default_redirect_url = 'circuits:circuit_list' + # # Terminations # @@ -189,6 +190,7 @@ def termination_add(request, pk): 'cancel_url': reverse('circuits:circuit', kwargs={'pk': circuit.pk}), }) + class TerminationEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'circuits.change_circuit' model = Termination @@ -197,6 +199,7 @@ class TerminationEditView(PermissionRequiredMixin, ObjectEditView): template_name = 'circuits/termination_edit.html' cancel_url = 'circuits:circuit_list' + @permission_required('circuits.delete_circuit') def termination_delete(request, pk): diff --git a/netbox/netbox/urls.py b/netbox/netbox/urls.py index 4b17bbb91..b67f04cfd 100644 --- a/netbox/netbox/urls.py +++ b/netbox/netbox/urls.py @@ -42,4 +42,3 @@ urlpatterns = [ url(r'^admin/', include(admin.site.urls)), ] -