X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/fbbadf65ca7826bcb8ad46bb855b8eb55a5eee56..f3b3b737aefbb812828fdec07e188ff8093ccf81:/forum/forms/qanda.py

diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py
index d54eabb..b499cbd 100644
--- 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
@@ -135,11 +135,17 @@ class SummaryField(forms.CharField):
 
 
 class FeedbackForm(forms.Form):
-    name = forms.CharField(label=_('Your name:'), required=False)
-    email = forms.EmailField(label=_('Email (not shared with anyone):'), required=True)
     message = forms.CharField(label=_('Your message:'), max_length=800,widget=forms.Textarea(attrs={'cols':60}))
     next = NextUrlField()
 
+    def __init__(self, user, *args, **kwargs):
+        super(FeedbackForm, self).__init__(*args, **kwargs)
+        if not user.is_authenticated():
+            self.fields['name'] = forms.CharField(label=_('Your name:'), required=False)
+            self.fields['email'] = forms.EmailField(label=_('Email (not shared with anyone):'), required=True)
+
+
+
 class AskForm(forms.Form):
     title  = TitleField()
     text   = QuestionEditorField()
@@ -162,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):
@@ -182,8 +188,8 @@ class RevisionForm(forms.Form):
     def __init__(self, post, *args, **kwargs):
         super(RevisionForm, self).__init__(*args, **kwargs)
 
-        revisions = post.revisions.all().values_list(
-            'revision', 'author__username', 'revised_at', 'summary')
+        revisions = post.revisions.all().values_list('revision', 'author__username', 'revised_at', 'summary').order_by('-revised_at')
+
         date_format = '%c'
         self.fields['revision'].choices = [
             (r[0], u'%s - %s (%s) %s' % (r[0], r[1], r[2].strftime(date_format), r[3]))
@@ -266,30 +272,27 @@ class EditUserForm(forms.Form):
                         
                     raise forms.ValidationError(_('this email has already been registered, please use another one'))
         return self.cleaned_data['email']
+        
 
 NOTIFICATION_CHOICES = (
     ('i', _('Instantly')),
-    ('d', _('Daily')),
-    ('w', _('Weekly')),
+    #('d', _('Daily')),
+    #('w', _('Weekly')),
     ('n', _('No notifications')),
 )
 
-class SubscriptionSettingsForm(forms.Form):
+class SubscriptionSettingsForm(forms.ModelForm):
+    enable_notifications = forms.BooleanField(widget=forms.HiddenInput, required=False)
     member_joins = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES)
     new_question = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES)
     new_question_watched_tags = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES)
     subscribed_questions = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES)
 
-    all_questions = forms.BooleanField(required=False, initial=False)
-    all_questions_watched_tags = forms.BooleanField(required=False, initial=False)
-    questions_asked = forms.BooleanField(required=False, initial=False)
-    questions_answered = forms.BooleanField(required=False, initial=False)
-    questions_commented = forms.BooleanField(required=False, initial=False)
-    questions_viewed = forms.BooleanField(required=False, initial=False)
-
-    notify_answers = forms.BooleanField(required=False, initial=False)
-    notify_reply_to_comments = forms.BooleanField(required=False, initial=False)
-    notify_comments_own_post = forms.BooleanField(required=False, initial=False)
-    notify_comments = forms.BooleanField(required=False, initial=False)
-    notify_accepted = forms.BooleanField(required=False, initial=False)
+    class Meta:
+        model = SubscriptionSettings
+
+class UserPreferencesForm(forms.Form):
+    sticky_sorts = forms.BooleanField(required=False, initial=False)
+
+