diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index e116e4556..f34e5f9cc 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -5,7 +5,7 @@ from django.contrib.auth.decorators import permission_required from django.contrib.auth.mixins import PermissionRequiredMixin from django.db import transaction from django.db.models import Count -from django.shortcuts import get_object_or_404, redirect, render +from django.shortcuts import get_object_or_404, redirect, render, reverse from django.views.generic import View from extras.models import Graph, GRAPH_TYPE_PROVIDER @@ -261,6 +261,7 @@ class CircuitTerminationCreateView(PermissionRequiredMixin, ObjectEditView): model = CircuitTermination model_form = forms.CircuitTerminationForm template_name = 'circuits/circuittermination_edit.html' + enable_add_another = False def alter_obj(self, obj, request, url_args, url_kwargs): if 'circuit' in url_kwargs: diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index eb7f71a25..1b729c847 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -452,6 +452,9 @@ class RackReservationCreateView(PermissionRequiredMixin, ObjectEditView): def get_return_url(self, request, obj): return obj.rack.get_absolute_url() + def get_add_url(self, obj): + return reverse('dcim:rack_add_reservation', kwargs={'rack': obj.rack.pk}) + class RackReservationEditView(RackReservationCreateView): permission_required = 'dcim.change_rackreservation' diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 7626d4012..73946fde9 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -197,6 +197,7 @@ class ImageAttachmentEditView(PermissionRequiredMixin, ObjectEditView): permission_required = 'extras.change_imageattachment' model = ImageAttachment model_form = ImageAttachmentForm + enable_add_another = False def alter_obj(self, imageattachment, request, args, kwargs): if not imageattachment.pk: diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 2e3e0105c..ea7dbd67e 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -983,6 +983,7 @@ class ServiceCreateView(PermissionRequiredMixin, ObjectEditView): model = Service model_form = forms.ServiceForm template_name = 'ipam/service_edit.html' + enable_add_another = False def alter_obj(self, obj, request, url_args, url_kwargs): if 'device' in url_kwargs: diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py index d15c9cbc2..a53048dd7 100644 --- a/netbox/secrets/views.py +++ b/netbox/secrets/views.py @@ -132,7 +132,7 @@ def secret_add(request, pk): form = forms.SecretForm(instance=secret) return render(request, 'secrets/secret_edit.html', { - 'secret': secret, + 'obj': secret, 'form': form, 'return_url': device.get_absolute_url(), }) @@ -185,7 +185,7 @@ def secret_edit(request, pk): form = forms.SecretForm(instance=secret) return render(request, 'secrets/secret_edit.html', { - 'secret': secret, + 'obj': secret, 'form': form, 'return_url': reverse('secrets:secret', kwargs={'pk': secret.pk}), }) diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html index a2c7d966f..1d3772ad9 100644 --- a/netbox/templates/circuits/circuittermination_edit.html +++ b/netbox/templates/circuits/circuittermination_edit.html @@ -1,91 +1,64 @@ -{% extends '_base.html' %} +{% extends 'utilities/obj_edit.html' %} {% load staticfiles %} {% load form_helpers %} -{% block content %} -
- {% csrf_token %} - {% for field in form.hidden_fields %} - {{ field }} - {% endfor %} -
-
-

{% block title %}Circuit {{ obj.circuit }} - {{ form.term_side.value }} Side{% endblock %}

- {% if form.non_field_errors %} -
-
Errors
-
- {{ form.non_field_errors }} -
-
- {% endif %} -
-
Location
-
-
- -
-

{{ obj.circuit.provider }}

-
-
-
- -
-

{{ obj.circuit.cid }}

-
-
-
- -
-

{{ form.term_side.value }}

-
-
- {% render_field form.site %} - {% render_field form.rack %} - {% render_field form.device %} - {% render_field form.interface %} -
-
-
-
Termination Details
-
-
- -
-
- {{ form.port_speed }} - {% include 'circuits/inc/speed_widget.html' with target_field='port_speed' %} -
- {{ form.port_speed.help_text }} -
-
-
- -
-
- {{ form.upstream_speed }} - {% include 'circuits/inc/speed_widget.html' with target_field='upstream_speed' %} -
- {{ form.upstream_speed.help_text }} -
-
- {% render_field form.xconnect_id %} - {% render_field form.pp_info %} -
+{% block title %}Circuit {{ obj.circuit }} - {{ form.term_side.value }} Side{% endblock %} + +{% block form %} +
+
Location
+
+
+ +
+

{{ obj.circuit.provider }}

-
-
-
- {% if obj.pk %} - - {% else %} - - {% endif %} - Cancel +
+ +
+

{{ obj.circuit.cid }}

+
+
+ +
+

{{ form.term_side.value }}

+
+
+ {% render_field form.site %} + {% render_field form.rack %} + {% render_field form.device %} + {% render_field form.interface %}
- +
+
+
Termination Details
+
+
+ +
+
+ {{ form.port_speed }} + {% include 'circuits/inc/speed_widget.html' with target_field='port_speed' %} +
+ {{ form.port_speed.help_text }} +
+
+
+ +
+
+ {{ form.upstream_speed }} + {% include 'circuits/inc/speed_widget.html' with target_field='upstream_speed' %} +
+ {{ form.upstream_speed.help_text }} +
+
+ {% render_field form.xconnect_id %} + {% render_field form.pp_info %} +
+
{% endblock %} {% block javascript %} diff --git a/netbox/templates/dcim/interface_edit.html b/netbox/templates/dcim/interface_edit.html index 60d233b03..d0015d0e2 100644 --- a/netbox/templates/dcim/interface_edit.html +++ b/netbox/templates/dcim/interface_edit.html @@ -30,17 +30,6 @@ {% endif %} {% endblock %} -{% block buttons %} - {% if obj.pk %} - - - {% else %} - - - {% endif %} - Cancel -{% endblock %} - {% block javascript %} {% endblock %} diff --git a/netbox/templates/tenancy/tenant_edit.html b/netbox/templates/tenancy/tenant_edit.html index 31bc73f3e..950602187 100644 --- a/netbox/templates/tenancy/tenant_edit.html +++ b/netbox/templates/tenancy/tenant_edit.html @@ -1,5 +1,4 @@ {% extends 'utilities/obj_edit.html' %} -{% load static from staticfiles %} {% load form_helpers %} {% block form %} diff --git a/netbox/templates/utilities/obj_edit.html b/netbox/templates/utilities/obj_edit.html index 16acc32ed..712e880b8 100644 --- a/netbox/templates/utilities/obj_edit.html +++ b/netbox/templates/utilities/obj_edit.html @@ -10,6 +10,10 @@

{% block title %}{% if obj.pk %}Editing {{ obj_type }} {{ obj }}{% else %}Add a new {{ obj_type }}{% endif %}{% endblock %}

+
+
+
+
{% block tabs %}{% endblock %} {% if form.non_field_errors %}
@@ -28,18 +32,30 @@
{% endblock %}
-
-
-
- {% block buttons %} - {% if obj.pk %} - - {% else %} - - - {% endif %} - Cancel - {% endblock %} +
+
+ {% block buttons %} +
+ + +
    +
  • + + {% if enable_add_another %} + + {% endif %} +
    • +
+
+
+ Cancel +
+ {% endblock %} +
diff --git a/netbox/templates/virtualization/interface_edit.html b/netbox/templates/virtualization/interface_edit.html index 7977f9fed..9f733035b 100644 --- a/netbox/templates/virtualization/interface_edit.html +++ b/netbox/templates/virtualization/interface_edit.html @@ -27,17 +27,6 @@ {% endif %} {% endblock %} -{% block buttons %} - {% if obj.pk %} - - - {% else %} - - - {% endif %} - Cancel -{% endblock %} - {% block javascript %}