X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/0b2532c7cb7ef08953a178f772592fc47685dc9f..30beae7541b44060bdd42b55fe525a1113452b55:/forum/forms.py diff --git a/forum/forms.py b/forum/forms.py index bf14d54..8582f3a 100644 --- a/forum/forms.py +++ b/forum/forms.py @@ -2,14 +2,13 @@ import re from datetime import date from django import forms from models import * -from const import * from django.utils.translation import ugettext as _ from django.contrib.humanize.templatetags.humanize import apnumber from forum.models import User from django.utils.safestring import mark_safe from forum.utils.forms import NextUrlField, UserNameField, SetPasswordForm -from django.conf import settings +from forum import settings import logging class TitleField(forms.CharField): @@ -31,18 +30,36 @@ class TitleField(forms.CharField): class EditorField(forms.CharField): def __init__(self, *args, **kwargs): super(EditorField, self).__init__(*args, **kwargs) - self.required = True self.widget = forms.Textarea(attrs={'id':'editor'}) self.label = _('content') self.help_text = u'' self.initial = '' + +class QuestionEditorField(EditorField): + def __init__(self, *args, **kwargs): + super(QuestionEditorField, self).__init__(*args, **kwargs) + self.required = not bool(settings.FORM_EMPTY_QUESTION_BODY) + + def clean(self, value): - if len(value) < settings.FORM_MIN_QUESTION_BODY and not settings.FORM_EMPTY_QUESTION_BODY: + if self.required and (len(value) < settings.FORM_MIN_QUESTION_BODY): raise forms.ValidationError(_('question content must be must be at least %s characters' % settings.FORM_MIN_QUESTION_BODY)) return value +class AnswerEditorField(EditorField): + def __init__(self, *args, **kwargs): + super(AnswerEditorField, self).__init__(*args, **kwargs) + self.required = True + + def clean(self, value): + if len(value) < settings.FORM_MIN_QUESTION_BODY: + raise forms.ValidationError(_('answer content must be must be at least %s characters' % settings.FORM_MIN_QUESTION_BODY)) + + return value + + class TagNamesField(forms.CharField): def __init__(self, *args, **kwargs): super(TagNamesField, self).__init__(*args, **kwargs) @@ -51,34 +68,32 @@ class TagNamesField(forms.CharField): self.max_length = 255 self.label = _('tags') #self.help_text = _('please use space to separate tags (this enables autocomplete feature)') - self.help_text = _('Tags are short keywords, with no spaces within. At least one %(min)s and up to %(max)s tags can be used.') % { - 'min': apnumber(settings.FORM_MIN_NUMBER_OF_TAGS), 'max': apnumber(settings.FORM_MAX_NUMBER_OF_TAGS) + self.help_text = _('Tags are short keywords, with no spaces within. At least %(min)s and up to %(max)s tags can be used.') % { + 'min': settings.FORM_MIN_NUMBER_OF_TAGS, 'max': settings.FORM_MAX_NUMBER_OF_TAGS } self.initial = '' def clean(self, value): value = super(TagNamesField, self).clean(value) - data = value.strip() - if len(data) < 1: - raise forms.ValidationError(_('tags are required')) + data = value.strip().lower() split_re = re.compile(r'[ ,]+') list = split_re.split(data) - list_temp = [] + if len(list) > settings.FORM_MAX_NUMBER_OF_TAGS or len(list) < settings.FORM_MIN_NUMBER_OF_TAGS: - raise forms.ValidationError(_('please use betwen %(min)s and %(max)s tags') % { - 'min': apnumber(settings.FORM_MIN_NUMBER_OF_TAGS), 'max': apnumber(settings.FORM_MAX_NUMBER_OF_TAGS) - }) + 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}) - tagname_re = re.compile(r'[a-z0-9]+') + list_temp = [] + tagname_re = re.compile(r'^[\w+\.-]+$', re.UNICODE) for tag in list: - if len(tag) > 20: - raise forms.ValidationError(_('tags must be shorter than 20 characters')) + 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 \'a-z\', 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) + return u' '.join(list_temp) class WikiField(forms.BooleanField): @@ -114,13 +129,13 @@ class FeedbackForm(forms.Form): class AskForm(forms.Form): title = TitleField() - text = EditorField() + text = QuestionEditorField() tags = TagNamesField() wiki = WikiField() class AnswerForm(forms.Form): - text = EditorField() + text = AnswerEditorField() wiki = WikiField() def __init__(self, question, *args, **kwargs): @@ -130,9 +145,6 @@ class AnswerForm(forms.Form): self.fields['wiki'].initial = True -class CloseForm(forms.Form): - reason = forms.ChoiceField(choices=CLOSE_REASONS) - class RetagQuestionForm(forms.Form): tags = TagNamesField() # initialize the default values @@ -160,7 +172,7 @@ class RevisionForm(forms.Form): class EditQuestionForm(forms.Form): title = TitleField() - text = EditorField() + text = QuestionEditorField() tags = TagNamesField() summary = SummaryField() @@ -179,7 +191,7 @@ class EditQuestionForm(forms.Form): self.fields['wiki'] = WikiField() class EditAnswerForm(forms.Form): - text = EditorField() + text = AnswerEditorField() summary = SummaryField() def __init__(self, answer, revision=None, *args, **kwargs): @@ -192,8 +204,6 @@ class EditAnswerForm(forms.Form): class EditUserForm(forms.Form): email = forms.EmailField(label=u'Email', help_text=_('this email does not have to be linked to gravatar'), required=True, max_length=255, widget=forms.TextInput(attrs={'size' : 35})) - if settings.EDITABLE_SCREEN_NAME: - username = UserNameField(label=_('Screen name')) realname = forms.CharField(label=_('Real name'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35})) website = forms.URLField(label=_('Website'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35})) city = forms.CharField(label=_('Location'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35})) @@ -202,8 +212,8 @@ class EditUserForm(forms.Form): def __init__(self, user, *args, **kwargs): super(EditUserForm, self).__init__(*args, **kwargs) - logging.debug('initializing the form') if settings.EDITABLE_SCREEN_NAME: + self.fields['username'] = UserNameField(label=_('Screen name')) self.fields['username'].initial = user.username self.fields['username'].user_instance = user self.fields['email'].initial = user.email @@ -233,6 +243,12 @@ class EditUserForm(forms.Form): raise forms.ValidationError(_('this email has already been registered, please use another one')) return self.cleaned_data['email'] +NOTIFICATION_CHOICES = ( + ('i', _('Instantly')), + ('d', _('Daily')), + ('w', _('Weekly')), + ('n', _('No notifications')), +) class SubscriptionSettingsForm(forms.Form): member_joins = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES)