Skip to content

Fixes #19268: Restore editing conflict protection for several object forms #19271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2025
Merged

Fixes #19268: Restore editing conflict protection for several object forms #19271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion netbox/templates/dcim/cable_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends 'generic/object_edit.html' %}

{% block form %}
{% include 'dcim/htmx/cable_edit.html' %}
{% include 'dcim/htmx/cable_edit.html' %}
{% endblock %}
4 changes: 3 additions & 1 deletion netbox/templates/dcim/device_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
{% load i18n %}

{% block form %}
{% render_errors form %}
{% for field in form.hidden_fields %}
{{ field }}
{% endfor %}

<div class="field-group my-5">
<div class="row">
Expand Down
3 changes: 3 additions & 0 deletions netbox/templates/dcim/htmx/cable_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
{% load form_helpers %}
{% load i18n %}

{% for field in form.hidden_fields %}
{{ field }}
{% endfor %}

{# A side termination #}
<div class="field-group mb-5">
Expand Down
4 changes: 4 additions & 0 deletions netbox/templates/dcim/virtualchassis_add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
{% load i18n %}

{% block form %}
{% for field in form.hidden_fields %}
{{ field }}
{% endfor %}

<div class="field-group my-5">
<div class="row">
<h2 class="col-9 offset-3">{% trans "Virtual Chassis" %}</h2>
Expand Down
4 changes: 4 additions & 0 deletions netbox/templates/dcim/virtualchassis_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,15 @@
{% block content %}
<div class="tab-pane show active" id="edit-form" role="tabpanel" aria-labelledby="object-list-tab">
<form action="" method="post" enctype="multipart/form-data" class="object-edit">
{% render_errors vc_form %}
{% for form in formset %}
{% render_errors form %}
{% endfor %}

{% csrf_token %}
{% for field in vc_form.hidden_fields %}
{{ field }}
{% endfor %}
{{ pk_form.pk }}
{{ formset.management_form }}
<div class="field-group my-5">
Expand Down
4 changes: 4 additions & 0 deletions netbox/templates/ipam/vlan_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
{% load i18n %}

{% block form %}
{% for field in form.hidden_fields %}
{{ field }}
{% endfor %}

<div class="field-group my-5">
<div class="row">
<h2 class="col-9 offset-3">{% trans "VLAN" %}</h2>
Expand Down