completed merge of user-groups with tag-editor, not tested yet

1 files changed, 11 insertions, 3 deletions

diff --git a/askbot/forms.py b/askbot/forms.py
index 7030643a..7baec106 100644
--- a/askbot/forms.py
+++ b/askbot/forms.py
@@ -357,7 +357,8 @@ class TagNamesField(forms.CharField):
 
     def __init__(self, *args, **kwargs):
         super(TagNamesField, self).__init__(*args, **kwargs)
-        self.required = askbot_settings.TAGS_ARE_REQUIRED
+        self.required = kwargs.get('required',
+                askbot_settings.TAGS_ARE_REQUIRED)
         self.widget = forms.TextInput(
             attrs={'size': 50, 'autocomplete': 'off'}
         )
@@ -899,6 +900,7 @@ class AskWidgetForm(forms.Form, FormWithHideableFields):
     '''Simple form with just the title to ask a question'''
 
     title = TitleField()
+    text = EditorField()
     ask_anonymously = forms.BooleanField(
         label=_('ask anonymously'),
         help_text=_(
@@ -908,12 +910,18 @@ class AskWidgetForm(forms.Form, FormWithHideableFields):
         required=False,
     )
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, include_text=True, *args, **kwargs):
         super(AskWidgetForm, self).__init__(*args, **kwargs)
         #hide ask_anonymously field
-        if askbot_settings.ALLOW_ASK_ANONYMOUSLY is False:
+        if not askbot_settings.ALLOW_ASK_ANONYMOUSLY:
             self.hide_field('ask_anonymously')
 
+        if not include_text:
+            self.hide_field('text')
+            self.fields['text'].required=False
+        else:
+            self.fields['text'].min_length = askbot_settings.MIN_QUESTION_BODY_LENGTH
+
 class AskByEmailForm(forms.Form):
     """:class:`~askbot.forms.AskByEmailForm`
     validates question data, where question was posted