NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-14 09:51:22 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixes #10938: render_field template tag should respect label kwarg

Browse Source
This commit is contained in:
jeremystretch 2022-11-21 09:49:30 -05:00
parent 4e27e8d3dd
commit 90f15b8d55
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-3.3.md
View File

@ -14,6 +14,7 @@
* [#10236](https://github.com/netbox-community/netbox/issues/10236) - Fix TypeError exception when viewing PDU configured for three-phase power * [#10236](https://github.com/netbox-community/netbox/issues/10236) - Fix TypeError exception when viewing PDU configured for three-phase power
* [#10579](https://github.com/netbox-community/netbox/issues/10579) - Mark cable traces terminating to a provider network as complete * [#10579](https://github.com/netbox-community/netbox/issues/10579) - Mark cable traces terminating to a provider network as complete
* [#10721](https://github.com/netbox-community/netbox/issues/10721) - Disable ordering by custom object field columns * [#10721](https://github.com/netbox-community/netbox/issues/10721) - Disable ordering by custom object field columns
* [#10938](https://github.com/netbox-community/netbox/issues/10938) - `render_field` template tag should respect `label` kwarg
* [#10969](https://github.com/netbox-community/netbox/issues/10969) - Update cable paths ending at associated rear port when creating new front ports * [#10969](https://github.com/netbox-community/netbox/issues/10969) - Update cable paths ending at associated rear port when creating new front ports
--- ---

16
netbox/utilities/templates/form_helpers/render_field.html
View File

@ -8,7 +8,7 @@
<div class="form-check{% if field.errors %} has-error{% endif %}"> <div class="form-check{% if field.errors %} has-error{% endif %}">
{{ field }} {{ field }}
<label for="{{ field.id_for_label }}" class="form-check-label"> <label for="{{ field.id_for_label }}" class="form-check-label">
{{ field.label }} {{ label }}
</label> </label>
</div> </div>
{% if field.help_text %} {% if field.help_text %}
@ -23,7 +23,7 @@
</div> </div>
</div> </div>
{% elif field|widget_type == 'textarea' and not field.label %} {% elif field|widget_type == 'textarea' and not label %}
<div class="row mb-3"> <div class="row mb-3">
{% if label %} {% if label %}
<label class="col-sm-3 col-form-label text-lg-end{% if field.field.required %} required{% endif %}" for="{{ field.id_for_label }}"> <label class="col-sm-3 col-form-label text-lg-end{% if field.field.required %} required{% endif %}" for="{{ field.id_for_label }}">
@ -48,7 +48,7 @@
{% elif field|widget_type == 'slugwidget' %} {% elif field|widget_type == 'slugwidget' %}
<div class="row mb-3"> <div class="row mb-3">
<label class="col-sm-3 col-form-label text-lg-end{% if field.field.required %} required{% endif %}" for="{{ field.id_for_label }}"> <label class="col-sm-3 col-form-label text-lg-end{% if field.field.required %} required{% endif %}" for="{{ field.id_for_label }}">
{{ field.label }} {{ label }}
</label> </label>
<div class="col"> <div class="col">
<div class="input-group"> <div class="input-group">
@ -71,13 +71,13 @@
accept="{{ field.field.widget.attrs.accept }}" accept="{{ field.field.widget.attrs.accept }}"
{% if field.is_required %}required{% endif %} {% if field.is_required %}required{% endif %}
/> />
<label for="{{ field.id_for_label }}" class="input-group-text">{{ field.label|bettertitle }}</label> <label for="{{ field.id_for_label }}" class="input-group-text">{{ label|bettertitle }}</label>
</div> </div>
{% elif field|widget_type == 'clearablefileinput' %} {% elif field|widget_type == 'clearablefileinput' %}
<div class="row mb-3"> <div class="row mb-3">
<label for="{{ field.id_for_label }}" class="form-label col col-md-3 text-lg-end{% if field.field.required %} required{% endif %}"> <label for="{{ field.id_for_label }}" class="form-label col col-md-3 text-lg-end{% if field.field.required %} required{% endif %}">
{{ field.label }} {{ label }}
</label> </label>
<div class="col col-md-9"> <div class="col col-md-9">
{{ field }} {{ field }}
@ -87,7 +87,7 @@
{% elif field|widget_type == 'selectmultiple' %} {% elif field|widget_type == 'selectmultiple' %}
<div class="row mb-3"> <div class="row mb-3">
<label for="{{ field.id_for_label }}" class="form-label col col-md-3 text-lg-end{% if field.field.required %} required{% endif %}"> <label for="{{ field.id_for_label }}" class="form-label col col-md-3 text-lg-end{% if field.field.required %} required{% endif %}">
{{ field.label }} {{ label }}
</label> </label>
<div class="col col-md-9"> <div class="col col-md-9">
{{ field }} {{ field }}
@ -103,7 +103,7 @@
{% else %} {% else %}
<div class="row mb-3"> <div class="row mb-3">
<label for="{{ field.id_for_label }}" class="col-sm-3 col-form-label text-lg-end{% if field.field.required %} required{% endif %}"> <label for="{{ field.id_for_label }}" class="col-sm-3 col-form-label text-lg-end{% if field.field.required %} required{% endif %}">
{{ field.label }} {{ label }}
</label> </label>
<div class="col"> <div class="col">
{{ field }} {{ field }}
@ -112,7 +112,7 @@
{% endif %} {% endif %}
<div class="invalid-feedback"> <div class="invalid-feedback">
{% if field.field.required %} {% if field.field.required %}
<strong>{{ field.label }}</strong> field is required. <strong>{{ label }}</strong> field is required.
{% endif %} {% endif %}
</div> </div>
{% if bulk_nullable %} {% if bulk_nullable %}

2
netbox/utilities/templatetags/form_helpers.py
View File

@ -40,7 +40,7 @@ def render_field(field, bulk_nullable=False, label=None):
""" """
return { return {
'field': field, 'field': field,
'label': label, 'label': label or field.label,
'bulk_nullable': bulk_nullable, 'bulk_nullable': bulk_nullable,
} }