X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/303b118d8ffc0ed2285166e362a91774f64ad807..eb27bb25105d0ed9f81e2ac45ce3e224e5930744:/forum/forms/qanda.py?ds=sidebyside diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py index 672ffd8..d0e86ec 100644 --- a/forum/forms/qanda.py +++ b/forum/forms/qanda.py @@ -3,24 +3,30 @@ 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.safestring import mark_safe -from general import NextUrlField, UserNameField, SetPasswordForm +from django.utils.encoding import smart_unicode +from general import NextUrlField, UserNameField + from forum import settings + +from forum.modules import call_all_handlers + import logging class TitleField(forms.CharField): def __init__(self, *args, **kwargs): super(TitleField, self).__init__(*args, **kwargs) + self.required = True - self.widget = forms.TextInput(attrs={'size' : 70, 'autocomplete' : 'off'}) self.max_length = 255 + self.widget = forms.TextInput(attrs={'size' : 70, 'autocomplete' : 'off', 'maxlength' : self.max_length}) self.label = _('title') self.help_text = _('please enter a descriptive title for your question') 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) @@ -29,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'' @@ -42,7 +49,9 @@ class QuestionEditorField(EditorField): def clean(self, value): - if self.required and (len(re.sub('[ ]{2,}', ' ', value)) < settings.FORM_MIN_QUESTION_BODY): + 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) return value @@ -53,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) @@ -62,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 @@ -74,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() @@ -154,6 +168,17 @@ class AskForm(forms.Form): super(AskForm, self).__init__(data, *args, **kwargs) self.fields['tags'] = TagNamesField(user) + + if 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) + for name, field in spam_fields.items(): + self.fields[name] = field + + self._anti_spam_fields = spam_fields.keys() + else: + self._anti_spam_fields = [] if settings.WIKI_ON: self.fields['wiki'] = WikiField() @@ -162,16 +187,23 @@ class AnswerForm(forms.Form): text = AnswerEditorField() wiki = WikiField() - def __init__(self, question, *args, **kwargs): - super(AnswerForm, self).__init__(*args, **kwargs) + 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): + 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 = [] if settings.WIKI_ON: self.fields['wiki'] = WikiField() - if question.nis.wiki: - self.fields['wiki'].initial = True - - class RetagQuestionForm(forms.Form): tags = TagNamesField() # initialize the default values @@ -192,7 +224,7 @@ class RevisionForm(forms.Form): date_format = '%c' self.fields['revision'].choices = [ - (r[0], u'%s - %s (%s) %s' % (r[0], r[1], r[2].strftime(date_format), r[3])) + (r[0], u'%s - %s (%s) %s' % (r[0], smart_unicode(r[1]), r[2].strftime(date_format), r[3])) for r in revisions] self.fields['revision'].initial = post.active_revision.revision @@ -214,6 +246,17 @@ 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): + 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 = [] + if settings.WIKI_ON: self.fields['wiki'] = WikiField(disabled=(question.nis.wiki and not user.can_cancel_wiki(question)), initial=question.nis.wiki) @@ -229,6 +272,17 @@ 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): + 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 = [] + if settings.WIKI_ON: self.fields['wiki'] = WikiField(disabled=(answer.nis.wiki and not user.can_cancel_wiki(answer)), initial=answer.nis.wiki) @@ -253,14 +307,13 @@ class EditUserForm(forms.Form): if user.date_of_birth is not None: self.fields['birthday'].initial = user.date_of_birth - else: - self.fields['birthday'].initial = '1990-01-01' + self.fields['about'].initial = user.about self.user = user 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: