Applies some of the Justin Grant's patches.

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

diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py
index ade6d5d4dea91d4c6a3812e6ca73c2fd4c2acb83..b499cbdebdd8e4f1f80c0722134838870efa740f 100644 (file)
--- a/forum/forms/qanda.py
+++ b/forum/forms/qanda.py
@@ -42,7 +42,7 @@ class QuestionEditorField(EditorField):
 
 
     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
@@ -168,8 +168,8 @@ class AnswerForm(forms.Form):
         if settings.WIKI_ON:
             self.fields['wiki'] = WikiField()
 
-            if question.nis.wiki:
-                self.fields['wiki'].initial = True
+            #if question.nis.wiki:
+            #    self.fields['wiki'].initial = True
 
 
 class RetagQuestionForm(forms.Form):
@@ -291,5 +291,8 @@ class SubscriptionSettingsForm(forms.ModelForm):
     class Meta:
         model = SubscriptionSettings
 
+class UserPreferencesForm(forms.Form):
+    sticky_sorts = forms.BooleanField(required=False, initial=False)
+