From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Mon, 17 May 2010 16:05:21 +0000 (+0000)
Subject: Fixing OSQA 244, Cannot answer question if not enough text.
X-Git-Tag: live~838
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/a96146751bc832353122e91895ea90512e266e4a

Fixing OSQA 244, Cannot answer question if not enough text.

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

diff --git a/forum/forms.py b/forum/forms.py
index 245372a..8582f3a 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -30,18 +30,36 @@ class TitleField(forms.CharField):
 class EditorField(forms.CharField):
     def __init__(self, *args, **kwargs):
         super(EditorField, self).__init__(*args, **kwargs)
-        self.required = True
         self.widget = forms.Textarea(attrs={'id':'editor'})
         self.label  = _('content')
         self.help_text = u''
         self.initial = ''
 
+
+class QuestionEditorField(EditorField):
+    def __init__(self, *args, **kwargs):
+        super(QuestionEditorField, self).__init__(*args, **kwargs)
+        self.required = not bool(settings.FORM_EMPTY_QUESTION_BODY)
+
+
     def clean(self, value):
-        if len(value) < settings.FORM_MIN_QUESTION_BODY and not settings.FORM_EMPTY_QUESTION_BODY:
+        if self.required and (len(value) < settings.FORM_MIN_QUESTION_BODY):
             raise forms.ValidationError(_('question content must be must be at least %s characters' % settings.FORM_MIN_QUESTION_BODY))
 
         return value
 
+class AnswerEditorField(EditorField):
+    def __init__(self, *args, **kwargs):
+        super(AnswerEditorField, self).__init__(*args, **kwargs)
+        self.required = True
+
+    def clean(self, value):
+        if len(value) < settings.FORM_MIN_QUESTION_BODY:
+            raise forms.ValidationError(_('answer content must be must be at least %s characters' % settings.FORM_MIN_QUESTION_BODY))
+
+        return value
+
+
 class TagNamesField(forms.CharField):
     def __init__(self, *args, **kwargs):
         super(TagNamesField, self).__init__(*args, **kwargs)
@@ -66,12 +84,12 @@ class TagNamesField(forms.CharField):
             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)
+        tagname_re = re.compile(r'^[\w+\.-]+$', re.UNICODE)
         for tag in list:
             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):
-                raise forms.ValidationError(_('please use following characters in tags: letters , numbers, and the following characters \'.-_#\''))
+                raise forms.ValidationError(_('please use following characters in tags: letters , numbers, and characters \'.-_\''))
             # only keep one same tag
             if tag not in list_temp and len(tag.strip()) > 0:
                 list_temp.append(tag)
@@ -111,13 +129,13 @@ class FeedbackForm(forms.Form):
 
 class AskForm(forms.Form):
     title  = TitleField()
-    text   = EditorField()
+    text   = QuestionEditorField()
     tags   = TagNamesField()
     wiki = WikiField()
 
 
 class AnswerForm(forms.Form):
-    text   = EditorField()
+    text   = AnswerEditorField()
     wiki   = WikiField()
 
     def __init__(self, question, *args, **kwargs):
@@ -154,7 +172,7 @@ class RevisionForm(forms.Form):
 
 class EditQuestionForm(forms.Form):
     title  = TitleField()
-    text   = EditorField()
+    text   = QuestionEditorField()
     tags   = TagNamesField()
     summary = SummaryField()
 
@@ -173,7 +191,7 @@ class EditQuestionForm(forms.Form):
             self.fields['wiki'] = WikiField()
 
 class EditAnswerForm(forms.Form):
-    text = EditorField()
+    text = AnswerEditorField()
     summary = SummaryField()
 
     def __init__(self, answer, revision=None, *args, **kwargs):
diff --git a/forum/middleware/request_utils.py b/forum/middleware/request_utils.py
index 6669565..46d56b7 100644
--- a/forum/middleware/request_utils.py
+++ b/forum/middleware/request_utils.py
@@ -37,6 +37,10 @@ class RequestUtils(object):
                     'app_title': APP_TITLE
                 }))
 
+        if request.session.get('redirect_POST_data', None):
+            request.POST = request.session.pop('redirect_POST_data')
+            request.META['REQUEST_METHOD'] = "POST"
+
         self.request = request
         request.utils = self
         return None
\ No newline at end of file
diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index bdc2c22..466df6a 100644
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -213,8 +213,8 @@
                         
                         </table>  
                     </div>
-                    <div id="previewer" class="wmd-preview"></div>
                     {{ answer.text.errors }}
+                    <div id="previewer" class="wmd-preview"></div>                    
                 </div>
                 <p><span class="form-error"></span></p>
                 <input type="submit" 
diff --git a/forum/views/readers.py b/forum/views/readers.py
index 3efb554..9eea978 100644
--- a/forum/views/readers.py
+++ b/forum/views/readers.py
@@ -234,7 +234,11 @@ def question(request, id, slug):
     if question.deleted and not request.user.can_view_deleted_post(question):
         raise Http404
 
-    answer_form = AnswerForm(question)
+    if request.POST:
+        answer_form = AnswerForm(question, request.POST)
+    else:
+        answer_form = AnswerForm(question)
+
     answers = request.user.get_visible_answers(question)
 
     if answers is not None:
diff --git a/forum/views/writers.py b/forum/views/writers.py
index 3b3e90b..cc2c807 100644
--- a/forum/views/writers.py
+++ b/forum/views/writers.py
@@ -196,6 +196,9 @@ def answer(request, id):
                 request.session['temp_node_type'] = 'answer'
                 request.session['temp_question_id'] = id
                 return HttpResponseRedirect(reverse('auth_action_signin', kwargs={'action': 'newquestion'}))
+        else:
+            request.session['redirect_POST_data'] = request.POST
+            return HttpResponseRedirect(question.get_absolute_url() + '#fmanswer')
 
     return HttpResponseRedirect(question.get_absolute_url())