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

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@671 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py
index 93705502c0cf9587142ade41968ed6dfe2a4e962..94285c7b4c2763e54c87375f7a9ec6e9e525bf97 100644 (file)
--- a/forum/forms/qanda.py
+++ b/forum/forms/qanda.py
@@ -158,8 +158,8 @@ class AskForm(forms.Form):
 
         self.fields['tags']   = TagNamesField(user)
         
 
         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 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()


@@ -171,8 +171,8 @@ class AnswerForm(forms.Form):
     def __init__(self, data=None, user=None, *args, **kwargs):
         super(AnswerForm, self).__init__(data, *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 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()


@@ -219,8 +219,8 @@ 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 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)


@@ -237,8 +237,8 @@ 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 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)

diff --git a/forum/settings/minrep.py b/forum/settings/minrep.py
index 820682345ace7bef79d8bd2e579807ebf52aec3b..f00053e7f2451e18327ce91f737f021ac991f923 100644 (file)
--- a/forum/settings/minrep.py
+++ b/forum/settings/minrep.py
@@ -3,9 +3,9 @@ from django.utils.translation import ugettext_lazy as _
 \r
 MIN_REP_SET = SettingSet('minrep', _('Minimum reputation config'), _("Configure the minimum reputation required to perform certain actions on your site."), 300)\r
 \r
 \r
 MIN_REP_SET = SettingSet('minrep', _('Minimum reputation config'), _("Configure the minimum reputation required to perform certain actions on your site."), 300)\r
 \r

-CAPTCHA_IF_REP_LESS_THAN = Setting('CAPTCHA_IF_REP_LESS_THAN', 0, MIN_REP_SET, dict(\r
-label = _("Show captcha if user with less reputation than"),\r
-help_text = _("If the user has less reputation, captcha is used to when adding new content.")))\r
+#CAPTCHA_IF_REP_LESS_THAN = Setting('CAPTCHA_IF_REP_LESS_THAN', 0, MIN_REP_SET, dict(\r
+#label = _("Show captcha if user with less reputation than"),\r
+#help_text = _("If the user has less reputation, captcha is used to when adding new content.")))\r

 \r
 REP_TO_VOTE_UP = Setting('REP_TO_VOTE_UP', 15, MIN_REP_SET, dict(\r
 label = _("Minimum reputation to vote up"),\r
 \r
 REP_TO_VOTE_UP = Setting('REP_TO_VOTE_UP', 15, MIN_REP_SET, dict(\r
 label = _("Minimum reputation to vote up"),\r