From 8f013ca0a2d44e0e004139bccd65826153dc9e0a Mon Sep 17 00:00:00 2001 From: Steve Roderick Date: Wed, 16 Sep 2020 11:36:29 +0100 Subject: [PATCH 1/3] added validation on tagname --- weblab/entities/forms.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/weblab/entities/forms.py b/weblab/entities/forms.py index 2ef48547a..fa09dbb22 100644 --- a/weblab/entities/forms.py +++ b/weblab/entities/forms.py @@ -1,6 +1,7 @@ from braces.forms import UserKwargModelFormMixin from django import forms from django.core.exceptions import ValidationError +from django.core.validators import RegexValidator from django.forms import formset_factory from accounts.models import User @@ -57,7 +58,7 @@ class EntityVersionForm(forms.Form): ) tag = forms.CharField( help_text='Optional short label for this version', - required=False) + required=False, validators=[RegexValidator(r'[-_A-Za-z0-9]', 'Please enter a valid tag name.')]) commit_message = forms.CharField( label='Description of this version', widget=forms.Textarea) @@ -94,7 +95,7 @@ class EntityTagVersionForm(forms.Form): tag = forms.CharField( label='New tag', help_text='Short label for this version', - required=True) + required=True, validators=[RegexValidator(r'[-_A-Za-z0-9]', 'Please enter a valid tag name.')]) class EntityCollaboratorForm(forms.Form): From 2701ff86942133e6232e091231af43c047603747 Mon Sep 17 00:00:00 2001 From: Steve Roderick Date: Tue, 22 Sep 2020 10:38:36 +0100 Subject: [PATCH 2/3] Changed tag validation message --- weblab/entities/forms.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/weblab/entities/forms.py b/weblab/entities/forms.py index fa09dbb22..18c17a564 100644 --- a/weblab/entities/forms.py +++ b/weblab/entities/forms.py @@ -95,7 +95,9 @@ class EntityTagVersionForm(forms.Form): tag = forms.CharField( label='New tag', help_text='Short label for this version', - required=True, validators=[RegexValidator(r'[-_A-Za-z0-9]', 'Please enter a valid tag name.')]) + required=True, + validators=[RegexValidator(r'[-_A-Za-z0-9]', 'Please enter a valid tag name.' + ' Only letters, numbers, dashes or underscores are allowed.')]) class EntityCollaboratorForm(forms.Form): From 4f5d82de6faec0562170e88f6d41ef4472badaaa Mon Sep 17 00:00:00 2001 From: Steve Roderick Date: Tue, 22 Sep 2020 10:58:08 +0100 Subject: [PATCH 3/3] Changed tag validation message --- weblab/entities/forms.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/weblab/entities/forms.py b/weblab/entities/forms.py index 18c17a564..6c0bd49b2 100644 --- a/weblab/entities/forms.py +++ b/weblab/entities/forms.py @@ -58,7 +58,9 @@ class EntityVersionForm(forms.Form): ) tag = forms.CharField( help_text='Optional short label for this version', - required=False, validators=[RegexValidator(r'[-_A-Za-z0-9]', 'Please enter a valid tag name.')]) + required=False, + validators=[RegexValidator(r'[-_A-Za-z0-9]', 'Please enter a valid tag name. ' + 'Only letters, numbers, dashes or underscores are allowed.' )]) commit_message = forms.CharField( label='Description of this version', widget=forms.Textarea)