X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/9308d78c7f1e4d2a4faf3b98d1b24c262f3b6287..2444d6ffd7995be782615589fb1d5aef2c8277ce:/forum/forms/qanda.py diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py index 7c58500..9890640 100644 --- a/forum/forms/qanda.py +++ b/forum/forms/qanda.py @@ -8,6 +8,9 @@ from django.contrib.humanize.templatetags.humanize import apnumber from django.utils.safestring import mark_safe from general import NextUrlField, UserNameField, SetPasswordForm from forum import settings + +from forum.modules import call_all_handlers + import logging class TitleField(forms.CharField): @@ -42,7 +45,7 @@ class QuestionEditorField(EditorField): def clean(self, value): - if self.required and (len(value) < settings.FORM_MIN_QUESTION_BODY): + 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,7 +56,7 @@ class AnswerEditorField(EditorField): self.required = True def clean(self, value): - if len(value) < settings.FORM_MIN_QUESTION_BODY: + 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) return value @@ -78,14 +81,16 @@ class TagNamesField(forms.CharField): data = value.strip().lower() split_re = re.compile(r'[ ,]+') - list = split_re.split(data) + list = {} + for tag in split_re.split(data): + list[tag] = tag if len(list) > settings.FORM_MAX_NUMBER_OF_TAGS or len(list) < settings.FORM_MIN_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}) list_temp = [] tagname_re = re.compile(r'^[\w+\.-]+$', re.UNICODE) - for tag in list: + 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): @@ -133,11 +138,17 @@ class SummaryField(forms.CharField): class FeedbackForm(forms.Form): - name = forms.CharField(label=_('Your name:'), required=False) - email = forms.EmailField(label=_('Email (not shared with anyone):'), required=False) message = forms.CharField(label=_('Your message:'), max_length=800,widget=forms.Textarea(attrs={'cols':60})) next = NextUrlField() + def __init__(self, user, *args, **kwargs): + super(FeedbackForm, self).__init__(*args, **kwargs) + if not user.is_authenticated(): + self.fields['name'] = forms.CharField(label=_('Your name:'), required=False) + self.fields['email'] = forms.EmailField(label=_('Email (not shared with anyone):'), required=True) + + + class AskForm(forms.Form): title = TitleField() text = QuestionEditorField() @@ -146,6 +157,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() @@ -154,16 +176,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 @@ -180,8 +209,8 @@ class RevisionForm(forms.Form): def __init__(self, post, *args, **kwargs): super(RevisionForm, self).__init__(*args, **kwargs) - revisions = post.revisions.all().values_list( - 'revision', 'author__username', 'revised_at', 'summary') + revisions = post.revisions.all().values_list('revision', 'author__username', 'revised_at', 'summary').order_by('-revised_at') + 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])) @@ -206,6 +235,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) @@ -221,6 +261,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) @@ -264,30 +315,27 @@ 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')), + #('d', _('Daily')), + #('w', _('Weekly')), ('n', _('No notifications')), ) -class SubscriptionSettingsForm(forms.Form): +class SubscriptionSettingsForm(forms.ModelForm): + enable_notifications = forms.BooleanField(widget=forms.HiddenInput, required=False) member_joins = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES) new_question = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES) new_question_watched_tags = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES) subscribed_questions = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES) - all_questions = forms.BooleanField(required=False, initial=False) - all_questions_watched_tags = forms.BooleanField(required=False, initial=False) - questions_asked = forms.BooleanField(required=False, initial=False) - questions_answered = forms.BooleanField(required=False, initial=False) - questions_commented = forms.BooleanField(required=False, initial=False) - questions_viewed = forms.BooleanField(required=False, initial=False) - - notify_answers = forms.BooleanField(required=False, initial=False) - notify_reply_to_comments = forms.BooleanField(required=False, initial=False) - notify_comments_own_post = forms.BooleanField(required=False, initial=False) - notify_comments = forms.BooleanField(required=False, initial=False) - notify_accepted = forms.BooleanField(required=False, initial=False) + class Meta: + model = SubscriptionSettings + +class UserPreferencesForm(forms.Form): + sticky_sorts = forms.BooleanField(required=False, initial=False) + +