mirror of
https://github.com/netbox-community/netbox.git
synced 2025-07-26 18:38:38 -06:00
Fix changelog message support for VirtualChassis
This commit is contained in:
parent
5ab696e55b
commit
a5d6173372
@ -426,6 +426,11 @@ class VirtualChassisCreateForm(NetBoxModelForm):
|
|||||||
help_text=_('Position of the first member device. Increases by one for each additional member.')
|
help_text=_('Position of the first member device. Increases by one for each additional member.')
|
||||||
)
|
)
|
||||||
|
|
||||||
|
fieldsets = (
|
||||||
|
FieldSet('name', 'domain', 'description', 'tags', name=_('Virtual Chassis')),
|
||||||
|
FieldSet('region', 'site_group', 'site', 'rack', 'members', 'initial_position', name=_('Member Devices')),
|
||||||
|
)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = VirtualChassis
|
model = VirtualChassis
|
||||||
fields = [
|
fields = [
|
||||||
|
@ -3702,7 +3702,6 @@ class VirtualChassisView(generic.ObjectView):
|
|||||||
class VirtualChassisCreateView(generic.ObjectEditView):
|
class VirtualChassisCreateView(generic.ObjectEditView):
|
||||||
queryset = VirtualChassis.objects.all()
|
queryset = VirtualChassis.objects.all()
|
||||||
form = forms.VirtualChassisCreateForm
|
form = forms.VirtualChassisCreateForm
|
||||||
template_name = 'dcim/virtualchassis_add.html'
|
|
||||||
|
|
||||||
|
|
||||||
@register_model_view(VirtualChassis, 'edit')
|
@register_model_view(VirtualChassis, 'edit')
|
||||||
@ -3750,6 +3749,7 @@ class VirtualChassisEditView(ObjectPermissionRequiredMixin, GetReturnURLMixin, V
|
|||||||
formset = VCMemberFormSet(request.POST, queryset=members_queryset)
|
formset = VCMemberFormSet(request.POST, queryset=members_queryset)
|
||||||
|
|
||||||
if vc_form.is_valid() and formset.is_valid():
|
if vc_form.is_valid() and formset.is_valid():
|
||||||
|
virtual_chassis._changelog_message = vc_form.cleaned_data.pop('changelog_message', '')
|
||||||
|
|
||||||
with transaction.atomic(using=router.db_for_write(Device)):
|
with transaction.atomic(using=router.db_for_write(Device)):
|
||||||
|
|
||||||
|
@ -1,40 +0,0 @@
|
|||||||
{% extends 'generic/object_edit.html' %}
|
|
||||||
{% load form_helpers %}
|
|
||||||
{% 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>
|
|
||||||
</div>
|
|
||||||
{% render_field form.name %}
|
|
||||||
{% render_field form.domain %}
|
|
||||||
{% render_field form.description %}
|
|
||||||
{% render_field form.tags %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="field-group my-5">
|
|
||||||
<div class="row">
|
|
||||||
<h2 class="col-9 offset-3">{% trans "Member Devices" %}</h2>
|
|
||||||
</div>
|
|
||||||
{% render_field form.region %}
|
|
||||||
{% render_field form.site_group %}
|
|
||||||
{% render_field form.site %}
|
|
||||||
{% render_field form.rack %}
|
|
||||||
{% render_field form.members %}
|
|
||||||
{% render_field form.initial_position %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% if form.custom_fields %}
|
|
||||||
<div class="field-group my-5">
|
|
||||||
<div class="row">
|
|
||||||
<h2 class="col-9 offset-3">{% trans "Custom Fields" %}</h2>
|
|
||||||
</div>
|
|
||||||
{% render_custom_fields form %}
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
{% endblock %}
|
|
@ -102,6 +102,9 @@
|
|||||||
{% endfor %}
|
{% endfor %}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
<div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3 mb-3">
|
||||||
|
{% render_field vc_form.changelog_message %}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-end">
|
<div class="text-end">
|
||||||
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
|
<a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
|
||||||
|
Loading…
Reference in New Issue
Block a user