From 77ac79f32c24039d3d737145221204640483d94e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 29 Nov 2016 17:29:56 -0500 Subject: [PATCH] Fixes #713: Include a label for the comments field when editing circuits, providers, or racks in bulk --- netbox/circuits/forms.py | 4 ++-- netbox/dcim/forms.py | 2 +- netbox/utilities/forms.py | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py index 288f2255f..c66a8bc40 100644 --- a/netbox/circuits/forms.py +++ b/netbox/circuits/forms.py @@ -54,7 +54,7 @@ class ProviderBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm): portal_url = forms.URLField(required=False, label='Portal') noc_contact = forms.CharField(required=False, widget=SmallTextarea, label='NOC contact') admin_contact = forms.CharField(required=False, widget=SmallTextarea, label='Admin contact') - comments = CommentField() + comments = CommentField(widget=SmallTextarea) class Meta: nullable_fields = ['asn', 'account', 'portal_url', 'noc_contact', 'admin_contact', 'comments'] @@ -183,7 +183,7 @@ class CircuitBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm): tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False) port_speed = forms.IntegerField(required=False, label='Port speed (Kbps)') commit_rate = forms.IntegerField(required=False, label='Commit rate (Kbps)') - comments = CommentField() + comments = CommentField(widget=SmallTextarea) class Meta: nullable_fields = ['tenant', 'port_speed', 'commit_rate', 'comments'] diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 44e30e964..fcda14fb5 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -221,7 +221,7 @@ class RackBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm): type = forms.ChoiceField(choices=add_blank_choice(RACK_TYPE_CHOICES), required=False, label='Type') width = forms.ChoiceField(choices=add_blank_choice(RACK_WIDTH_CHOICES), required=False, label='Width') u_height = forms.IntegerField(required=False, label='Height (U)') - comments = CommentField() + comments = CommentField(widget=SmallTextarea) class Meta: nullable_fields = ['group', 'tenant', 'role', 'comments'] diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 74e0749db..7104e34c0 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -234,6 +234,7 @@ class CommentField(forms.CharField): A textarea with support for GitHub-Flavored Markdown. Exists mostly just to add a standard help_text. """ widget = forms.Textarea + default_label = 'Comments' # TODO: Port GFM syntax cheat sheet to internal documentation default_helptext = ' '\ ''\ @@ -241,8 +242,9 @@ class CommentField(forms.CharField): def __init__(self, *args, **kwargs): required = kwargs.pop('required', False) + label = kwargs.pop('label', self.default_label) help_text = kwargs.pop('help_text', self.default_helptext) - super(CommentField, self).__init__(required=required, help_text=help_text, *args, **kwargs) + super(CommentField, self).__init__(required=required, label=label, help_text=help_text, *args, **kwargs) class FlexibleModelChoiceField(forms.ModelChoiceField):