diff --git a/CHANGELOG.md b/CHANGELOG.md index a83ec5533..7986d5afe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ v2.6.4 (FUTURE) * [#3501](https://github.com/netbox-community/netbox/issues/3501) - Fix rendering of checkboxes on custom script forms * [#3511](https://github.com/netbox-community/netbox/issues/3511) - Correct API URL for nested device bays * [#3513](https://github.com/netbox-community/netbox/issues/3513) - Fix assignment of tags when creating front/rear ports +* [#3514](https://github.com/netbox-community/netbox/issues/3514) - Label TextVar fields when rendering custom script forms v2.6.3 (2019-09-04) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index d59caae65..aec7a6723 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -809,6 +809,7 @@ class DeviceTypeForm(BootstrapMixin, CustomFieldForm): slug = SlugField( slug_source='model' ) + comments = CommentField() tags = TagField( required=False ) @@ -1358,7 +1359,10 @@ class DeviceForm(BootstrapMixin, TenancyForm, CustomFieldForm): ) comments = CommentField() tags = TagField(required=False) - local_context_data = JSONField(required=False) + local_context_data = JSONField( + required=False, + label='' + ) class Meta: model = Device diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py index 19f55c345..61bf2d7f3 100644 --- a/netbox/extras/forms.py +++ b/netbox/extras/forms.py @@ -241,7 +241,9 @@ class TagBulkEditForm(BootstrapMixin, BulkEditForm): # class ConfigContextForm(BootstrapMixin, forms.ModelForm): - data = JSONField() + data = JSONField( + label='' + ) class Meta: model = ConfigContext diff --git a/netbox/secrets/forms.py b/netbox/secrets/forms.py index 6c13ca243..ed0f455c1 100644 --- a/netbox/secrets/forms.py +++ b/netbox/secrets/forms.py @@ -199,6 +199,9 @@ class UserKeyForm(BootstrapMixin, forms.ModelForm): 'public_key': "Enter your public RSA key. Keep the private one with you; you'll need it for decryption. " "Please note that passphrase-protected keys are not supported.", } + labels = { + 'public_key': '' + } def clean_public_key(self): key = self.cleaned_data['public_key'] diff --git a/netbox/templates/utilities/render_field.html b/netbox/templates/utilities/render_field.html index 21b5b905a..e69296873 100644 --- a/netbox/templates/utilities/render_field.html +++ b/netbox/templates/utilities/render_field.html @@ -24,7 +24,7 @@ {% endif %} - {% elif field|widget_type == 'textarea' %} + {% elif field|widget_type == 'textarea' and not field.label %}