Skip to content

Commit 46a3ce2

Browse files
Fixes #19268: Restore editing conflict protection for several object forms (#19271)
1 parent 1850c21 commit 46a3ce2

File tree

6 files changed

+19
-2
lines changed

6 files changed

+19
-2
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{% extends 'generic/object_edit.html' %}
22

33
{% block form %}
4-
{% include 'dcim/htmx/cable_edit.html' %}
4+
{% include 'dcim/htmx/cable_edit.html' %}
55
{% endblock %}

netbox/templates/dcim/device_edit.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
{% load i18n %}
44

55
{% block form %}
6-
{% render_errors form %}
6+
{% for field in form.hidden_fields %}
7+
{{ field }}
8+
{% endfor %}
79

810
<div class="field-group my-5">
911
<div class="row">

netbox/templates/dcim/htmx/cable_edit.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
{% load form_helpers %}
44
{% load i18n %}
55

6+
{% for field in form.hidden_fields %}
7+
{{ field }}
8+
{% endfor %}
69

710
{# A side termination #}
811
<div class="field-group mb-5">

netbox/templates/dcim/virtualchassis_add.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
{% load i18n %}
44

55
{% block form %}
6+
{% for field in form.hidden_fields %}
7+
{{ field }}
8+
{% endfor %}
9+
610
<div class="field-group my-5">
711
<div class="row">
812
<h2 class="col-9 offset-3">{% trans "Virtual Chassis" %}</h2>

netbox/templates/dcim/virtualchassis_edit.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,15 @@
1212
{% block content %}
1313
<div class="tab-pane show active" id="edit-form" role="tabpanel" aria-labelledby="object-list-tab">
1414
<form action="" method="post" enctype="multipart/form-data" class="object-edit">
15+
{% render_errors vc_form %}
1516
{% for form in formset %}
1617
{% render_errors form %}
1718
{% endfor %}
1819

1920
{% csrf_token %}
21+
{% for field in vc_form.hidden_fields %}
22+
{{ field }}
23+
{% endfor %}
2024
{{ pk_form.pk }}
2125
{{ formset.management_form }}
2226
<div class="field-group my-5">

netbox/templates/ipam/vlan_edit.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
{% load i18n %}
66

77
{% block form %}
8+
{% for field in form.hidden_fields %}
9+
{{ field }}
10+
{% endfor %}
11+
812
<div class="field-group my-5">
913
<div class="row">
1014
<h2 class="col-9 offset-3">{% trans "VLAN" %}</h2>

0 commit comments

Comments
 (0)