NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 01:48:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Clean up form rendering

Browse Source
This commit is contained in:
jeremystretch 2021-12-28 10:22:00 -05:00
parent 4075cc8518
commit e0319cc894
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
netbox/dcim/forms/models.py
View File

@ -1236,17 +1236,17 @@ class InterfaceForm(InterfaceCommonForm, CustomFieldModelForm):
'mgmt_only', 'mark_connected', 'description', 'mode', 'rf_role', 'rf_channel', 'rf_channel_frequency', 'mgmt_only', 'mark_connected', 'description', 'mode', 'rf_role', 'rf_channel', 'rf_channel_frequency',
'rf_channel_width', 'tx_power', 'wireless_lans', 'untagged_vlan', 'tagged_vlans', 'tags', 'rf_channel_width', 'tx_power', 'wireless_lans', 'untagged_vlan', 'tagged_vlans', 'tags',
] ]
# fieldsets = ( fieldsets = (
# ('Interface', ('device', 'name', 'type', 'label', 'description', 'tags')), ('Interface', ('device', 'name', 'type', 'label', 'description', 'tags')),
# ('Addressing', ('mac_address', 'wwn')), ('Addressing', ('mac_address', 'wwn')),
# ('Operation', ('mtu', 'tx_power', 'enabled', 'mgmt_only', 'mark_connected')), ('Operation', ('mtu', 'tx_power', 'enabled', 'mgmt_only', 'mark_connected')),
# ('Related Interfaces', ('parent', 'bridge', 'lag')), ('Related Interfaces', ('parent', 'bridge', 'lag')),
# ('802.1Q Switching', ('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans')), ('802.1Q Switching', ('mode', 'vlan_group', 'untagged_vlan', 'tagged_vlans')),
# ('Wireless', ( ('Wireless', (
# 'rf_role', 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'wireless_lan_group', 'rf_role', 'rf_channel', 'rf_channel_frequency', 'rf_channel_width', 'wireless_lan_group',
# 'wireless_lans', 'wireless_lans',
# )), )),
# ) )
widgets = { widgets = {
'device': forms.HiddenInput(), 'device': forms.HiddenInput(),
'type': StaticSelect(), 'type': StaticSelect(),
@ -1358,9 +1358,6 @@ class PopulateDeviceBayForm(BootstrapMixin, forms.Form):
class InventoryItemForm(CustomFieldModelForm): class InventoryItemForm(CustomFieldModelForm):
device = DynamicModelChoiceField(
queryset=Device.objects.all()
)
parent = DynamicModelChoiceField( parent = DynamicModelChoiceField(
queryset=InventoryItem.objects.all(), queryset=InventoryItem.objects.all(),
required=False, required=False,
@ -1401,6 +1398,9 @@ class InventoryItemForm(CustomFieldModelForm):
('Hardware', ('manufacturer', 'part_id', 'serial', 'asset_tag')), ('Hardware', ('manufacturer', 'part_id', 'serial', 'asset_tag')),
('Component', ('component_type', 'component_id')), ('Component', ('component_type', 'component_id')),
) )
widgets = {
'device': forms.HiddenInput(),
}
# #

2
netbox/netbox/views/generic/object_views.py
View File

@ -706,6 +706,7 @@ class ComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View
form, model_form = self.initialize_forms(request) form, model_form = self.initialize_forms(request)
return render(request, self.template_name, { return render(request, self.template_name, {
'obj': self.queryset.model,
'obj_type': self.queryset.model._meta.verbose_name, 'obj_type': self.queryset.model._meta.verbose_name,
'replication_form': form, 'replication_form': form,
'form': model_form, 'form': model_form,
@ -724,6 +725,7 @@ class ComponentCreateView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View
return redirect(self.get_return_url(request)) return redirect(self.get_return_url(request))
return render(request, self.template_name, { return render(request, self.template_name, {
'obj': self.queryset.model,
'obj_type': self.queryset.model._meta.verbose_name, 'obj_type': self.queryset.model._meta.verbose_name,
'replication_form': form, 'replication_form': form,
'form': model_form, 'form': model_form,

8
netbox/templates/generic/object_edit.html
View File

@ -29,7 +29,7 @@
</div> </div>
{% endif %} {% endif %}
<form action="" method="post" enctype="multipart/form-data" class="form-object-edit"> <form action="" method="post" enctype="multipart/form-data" class="form-object-edit mt-5">
{% csrf_token %} {% csrf_token %}
{% block form %} {% block form %}
@ -47,7 +47,11 @@
<h5 class="offset-sm-3">{{ group }}</h5> <h5 class="offset-sm-3">{{ group }}</h5>
</div> </div>
{% for name in fields %} {% for name in fields %}
{% render_field form|getfield:name %} {% with field=form|getfield:name %}
{% if not field.field.widget.is_hidden %}
{% render_field field %}
{% endif %}
{% endwith %}
{% endfor %} {% endfor %}
</div> </div>
{% endfor %} {% endfor %}