X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/a2ce05e9e572b7416203c7fbd30bb060ba825d0e..160b51ec288220f2e784b680c7854178d0818f87:/forum/forms/qanda.py

diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py
index 3e95355..a81279b 100644
--- a/forum/forms/qanda.py
+++ b/forum/forms/qanda.py
@@ -3,11 +3,9 @@ from datetime import date
 from django import forms
 from forum.models import *
 from django.utils.translation import ugettext as _
-from django.contrib.humanize.templatetags.humanize import apnumber
 
 from django.utils.encoding import smart_unicode
-from django.utils.safestring import mark_safe
-from general import NextUrlField, UserNameField, SetPasswordForm
+from general import NextUrlField, UserNameField
 
 from forum import settings
 
@@ -18,6 +16,7 @@ import logging
 class TitleField(forms.CharField):
     def __init__(self, *args, **kwargs):
         super(TitleField, self).__init__(*args, **kwargs)
+
         self.required = True
         self.max_length = 255
         self.widget = forms.TextInput(attrs={'size' : 70, 'autocomplete' : 'off', 'maxlength' : self.max_length})
@@ -26,6 +25,8 @@ class TitleField(forms.CharField):
         self.initial = ''
 
     def clean(self, value):
+        super(TitleField, self).clean(value)
+
         if len(value) < settings.FORM_MIN_QUESTION_TITLE:
             raise forms.ValidationError(_('title must be must be at least %s characters') % settings.FORM_MIN_QUESTION_TITLE)
 
@@ -34,6 +35,7 @@ class TitleField(forms.CharField):
 class EditorField(forms.CharField):
     def __init__(self, *args, **kwargs):
         super(EditorField, self).__init__(*args, **kwargs)
+
         self.widget = forms.Textarea(attrs={'id':'editor'})
         self.label  = _('content')
         self.help_text = u''
@@ -47,6 +49,8 @@ class QuestionEditorField(EditorField):
 
 
     def clean(self, value):
+        super(QuestionEditorField, self).clean(value)
+
         if not bool(settings.FORM_EMPTY_QUESTION_BODY) and (len(re.sub('[ ]{2,}', ' ', value)) < settings.FORM_MIN_QUESTION_BODY):
             raise forms.ValidationError(_('question content must be at least %s characters') % settings.FORM_MIN_QUESTION_BODY)
 
@@ -58,6 +62,8 @@ class AnswerEditorField(EditorField):
         self.required = True
 
     def clean(self, value):
+        super(AnswerEditorField, self).clean(value)
+
         if len(re.sub('[ ]{2,}', ' ', value)) < settings.FORM_MIN_QUESTION_BODY:
             raise forms.ValidationError(_('answer content must be at least %s characters') % settings.FORM_MIN_QUESTION_BODY)
 
@@ -67,6 +73,7 @@ class AnswerEditorField(EditorField):
 class TagNamesField(forms.CharField):
     def __init__(self, user=None, *args, **kwargs):
         super(TagNamesField, self).__init__(*args, **kwargs)
+
         self.required = True
         self.widget = forms.TextInput(attrs={'size' : 50, 'autocomplete' : 'off'})
         self.max_length = 255
@@ -79,6 +86,8 @@ class TagNamesField(forms.CharField):
         self.user = user
 
     def clean(self, value):
+        super(TagNamesField, self).clean(value)
+
         value = super(TagNamesField, self).clean(value)
         data = value.strip().lower()
 
@@ -91,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)
@@ -304,7 +313,7 @@ class EditUserForm(forms.Form):
 
     def clean_email(self):
         if self.user.email != self.cleaned_data['email']:
-            if settings.EMAIL_UNIQUE == True:
+            if settings.EMAIL_UNIQUE:
                 if 'email' in self.cleaned_data:
                     from forum.models import User
                     try: