From 160b51ec288220f2e784b680c7854178d0818f87 Mon Sep 17 00:00:00 2001 From: jordan Date: Sat, 13 Aug 2011 13:02:46 +0000 Subject: [PATCH] allow the # character in tags, changing the tags regular expression and the error message to include # git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1160 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/forms/qanda.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py index d0e86ec..a81279b 100644 --- a/forum/forms/qanda.py +++ b/forum/forms/qanda.py @@ -100,12 +100,12 @@ class TagNamesField(forms.CharField): raise forms.ValidationError(_('please use between %(min)s and %(max)s tags') % { 'min': settings.FORM_MIN_NUMBER_OF_TAGS, 'max': settings.FORM_MAX_NUMBER_OF_TAGS}) list_temp = [] - tagname_re = re.compile(r'^[\w+\.-]+$', re.UNICODE) + tagname_re = re.compile(r'^[\w+#\.-]+$', re.UNICODE) for key,tag in list.items(): if len(tag) > settings.FORM_MAX_LENGTH_OF_TAG or len(tag) < settings.FORM_MIN_LENGTH_OF_TAG: raise forms.ValidationError(_('please use between %(min)s and %(max)s characters in you tags') % { 'min': settings.FORM_MIN_LENGTH_OF_TAG, 'max': settings.FORM_MAX_LENGTH_OF_TAG}) if not tagname_re.match(tag): - raise forms.ValidationError(_('please use following characters in tags: letters , numbers, and characters \'.-_\'')) + raise forms.ValidationError(_('please use following characters in tags: letters , numbers, and characters \'.#-_\'')) # only keep one same tag if tag not in list_temp and len(tag.strip()) > 0: list_temp.append(tag) -- 2.39.5