Disables the recaptcha feature for a while. It was causing some nasty bugs.

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

diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py
index 672ffd8683d41a7c41b1f3f2889e26afb75d2eba..94285c7b4c2763e54c87375f7a9ec6e9e525bf97 100644 (file)
--- 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 django.utils.safestring import mark_safe
 from general import NextUrlField, UserNameField, SetPasswordForm
 from forum import settings

+
+from forum_modules.recaptcha.formfield import ReCaptchaField
+

 import logging
 
 class TitleField(forms.CharField):
 import logging
 
 class TitleField(forms.CharField):


@@ -42,7 +45,7 @@ class QuestionEditorField(EditorField):
 
 
     def clean(self, value):
 
 
     def clean(self, value):

-        if self.required and (len(re.sub('[ ]{2,}', ' ', 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
             raise forms.ValidationError(_('question content must be at least %s characters') % settings.FORM_MIN_QUESTION_BODY)
 
         return value


@@ -154,6 +157,9 @@ class AskForm(forms.Form):
         super(AskForm, self).__init__(data, *args, **kwargs)
 
         self.fields['tags']   = TagNamesField(user)
         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):
+        #    self.fields['captcha'] = ReCaptchaField()

 
         if settings.WIKI_ON:
             self.fields['wiki'] = WikiField()
 
         if settings.WIKI_ON:
             self.fields['wiki'] = WikiField()


@@ -162,16 +168,15 @@ class AnswerForm(forms.Form):
     text   = AnswerEditorField()
     wiki   = WikiField()
 
     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):
+        #    self.fields['captcha'] = ReCaptchaField()

 
         if settings.WIKI_ON:
             self.fields['wiki'] = WikiField()
 
 
         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
 class RetagQuestionForm(forms.Form):
     tags   = TagNamesField()
     # initialize the default values


@@ -214,6 +219,9 @@ class EditQuestionForm(forms.Form):
         self.fields['tags'] = TagNamesField(user)
         self.fields['tags'].initial = revision.tagnames
 
         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):
+        #    self.fields['captcha'] = ReCaptchaField()
+

         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)
 


@@ -229,6 +237,9 @@ class EditAnswerForm(forms.Form):
 
         self.fields['text'].initial = revision.body
 
 
         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()
+        

         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)