mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Clean up CustomField regex validation

Browse Source
This commit is contained in:
Jeremy Stretch
2020-11-10 10:21:18 -05:00
parent b8a7870750
commit 3d6bf1e0f8
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
netbox/extras/admin.py
View File

@ -75,6 +75,14 @@ class CustomFieldForm(forms.ModelForm):
class Meta: class Meta:
model = CustomField model = CustomField
exclude = [] exclude = []
widgets = {
'validation_regex': forms.Textarea(
attrs={
'cols': 80,
'rows': 3,
}
)
}
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
@ -109,7 +117,8 @@ class CustomFieldAdmin(admin.ModelAdmin):
'fields': ('content_types',) 'fields': ('content_types',)
}), }),
('Validation Rules', { ('Validation Rules', {
'fields': ('validation_minimum', 'validation_maximum', 'validation_regex') 'fields': ('validation_minimum', 'validation_maximum', 'validation_regex'),
'classes': ('monospace',)
}), }),
('Choices', { ('Choices', {
'description': 'A selection field must have two or more choices assigned to it.', 'description': 'A selection field must have two or more choices assigned to it.',

6
netbox/extras/models/customfields.py
View File

@ -70,7 +70,8 @@ class CustomField(models.Model):
) )
name = models.CharField( name = models.CharField(
max_length=50, max_length=50,
unique=True unique=True,
help_text='Internal field name'
) )
label = models.CharField( label = models.CharField(
max_length=50, max_length=50,
@ -120,7 +121,8 @@ class CustomField(models.Model):
validators=[validate_regex], validators=[validate_regex],
max_length=500, max_length=500,
verbose_name='Validation regex', verbose_name='Validation regex',
help_text='Regular expression to enforce on text field values' help_text='Regular expression to enforce on text field values. Use ^ and $ to force matching of entire string. '
'For example, <code>^[A-Z]{3}$</code> will limit values to exactly three uppercase letters.'
) )
choices = ArrayField( choices = ArrayField(
base_field=models.CharField(max_length=100), base_field=models.CharField(max_length=100),