resolves a unicode issue in the convert answer to comment tool (username specific...

[osqa.git] / forum / forms / qanda.py

diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py
index 93705502c0cf9587142ade41968ed6dfe2a4e962..3e95355a79e46ad9173b47c2a451f236e8d16e68 100644 (file)
--- a/forum/forms/qanda.py
+++ b/forum/forms/qanda.py
@@ -5,11 +5,13 @@ from forum.models import *
 from django.utils.translation import ugettext as _
 from django.contrib.humanize.templatetags.humanize import apnumber
 
 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 django.utils.safestring import mark_safe
 from general import NextUrlField, UserNameField, SetPasswordForm

+

 from forum import settings
 
 from forum import settings
 

-from forum_modules.recaptcha.formfield import ReCaptchaField
+from forum.modules import call_all_handlers

 
 import logging
 
 
 import logging
 


@@ -17,8 +19,8 @@ class TitleField(forms.CharField):
     def __init__(self, *args, **kwargs):
         super(TitleField, self).__init__(*args, **kwargs)
         self.required = True
     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.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 = ''
         self.label  = _('title')
         self.help_text = _('please enter a descriptive title for your question')
         self.initial = ''


@@ -159,7 +161,15 @@ 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):
         self.fields['tags']   = TagNamesField(user)
         
         if int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff):

-            self.fields['captcha'] = ReCaptchaField()
+            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 settings.WIKI_ON:
             self.fields['wiki'] = WikiField()


@@ -172,7 +182,15 @@ class AnswerForm(forms.Form):
         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):
         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):

-            self.fields['captcha'] = ReCaptchaField()
+            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 settings.WIKI_ON:
             self.fields['wiki'] = WikiField()


@@ -197,7 +215,7 @@ class RevisionForm(forms.Form):
 
         date_format = '%c'
         self.fields['revision'].choices = [
 
         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
             for r in revisions]
 
         self.fields['revision'].initial = post.active_revision.revision


@@ -220,7 +238,15 @@ class EditQuestionForm(forms.Form):
         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):
         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):

-            self.fields['captcha'] = ReCaptchaField()
+            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)
 
         if settings.WIKI_ON:
             self.fields['wiki'] = WikiField(disabled=(question.nis.wiki and not user.can_cancel_wiki(question)), initial=question.nis.wiki)


@@ -238,7 +264,15 @@ 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):
         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):

-            self.fields['captcha'] = ReCaptchaField()
+            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)
         
         if settings.WIKI_ON:
             self.fields['wiki'] = WikiField(disabled=(answer.nis.wiki and not user.can_cancel_wiki(answer)), initial=answer.nis.wiki)


@@ -264,8 +298,7 @@ class EditUserForm(forms.Form):
 
         if user.date_of_birth is not None:
             self.fields['birthday'].initial = user.date_of_birth
 
         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
 
         self.fields['about'].initial = user.about
         self.user = user