X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/7f3dd827951cbd24d8549bbe6cc50ab3b54a7dfc..f092d2a066bd98474491e85f3661b9b5d76ebd16:/forum/forms/qanda.py diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py index cd9fc78..d2cc837 100644 --- a/forum/forms/qanda.py +++ b/forum/forms/qanda.py @@ -3,13 +3,11 @@ 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 +from forum import settings, REQUEST_HOLDER from forum.modules import call_all_handlers @@ -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,7 +25,7 @@ class TitleField(forms.CharField): self.initial = '' def clean(self, value): - super(TitleField, self).clean(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) @@ -36,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'' @@ -49,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) @@ -60,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) @@ -69,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 @@ -81,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() @@ -93,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) @@ -151,6 +158,17 @@ class FeedbackForm(forms.Form): self.fields['name'] = forms.CharField(label=_('Your name:'), required=False) self.fields['email'] = forms.EmailField(label=_('Email (not shared with anyone):'), required=True) + # Create anti spam fields + spam_fields = call_all_handlers('create_anti_spam_field') + if spam_fields: + spam_fields = dict(spam_fields) + for name, field in spam_fields.items(): + self.fields[name] = field + + self._anti_spam_fields = spam_fields.keys() + else: + self._anti_spam_fields = [] + class AskForm(forms.Form): @@ -162,7 +180,7 @@ class AskForm(forms.Form): self.fields['tags'] = TagNamesField(user) - if int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff): + if not user.is_authenticated() or (int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff)): spam_fields = call_all_handlers('create_anti_spam_field') if spam_fields: spam_fields = dict(spam_fields) @@ -183,7 +201,7 @@ class AnswerForm(forms.Form): def __init__(self, data=None, user=None, *args, **kwargs): super(AnswerForm, self).__init__(data, *args, **kwargs) - if int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff): + if not user.is_authenticated() or (int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff)): spam_fields = call_all_handlers('create_anti_spam_field') if spam_fields: spam_fields = dict(spam_fields) @@ -239,7 +257,7 @@ class EditQuestionForm(forms.Form): self.fields['tags'] = TagNamesField(user) self.fields['tags'].initial = revision.tagnames - if int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff): + if not user.is_authenticated() or (int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff)): spam_fields = call_all_handlers('create_anti_spam_field') if spam_fields: spam_fields = dict(spam_fields) @@ -265,7 +283,7 @@ class EditAnswerForm(forms.Form): self.fields['text'].initial = revision.body - if int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff): + if not user.is_authenticated() or (int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff)): spam_fields = call_all_handlers('create_anti_spam_field') if spam_fields: spam_fields = dict(spam_fields) @@ -289,7 +307,7 @@ class EditUserForm(forms.Form): def __init__(self, user, *args, **kwargs): super(EditUserForm, self).__init__(*args, **kwargs) - if settings.EDITABLE_SCREEN_NAME: + if settings.EDITABLE_SCREEN_NAME or (REQUEST_HOLDER.request.user.is_authenticated() and REQUEST_HOLDER.request.user.is_superuser): self.fields['username'] = UserNameField(label=_('Screen name')) self.fields['username'].initial = user.username self.fields['username'].user_instance = user @@ -306,7 +324,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: