Closing OSQA 35. Give admins and moderators an easy way to award karma points.

[osqa.git] / forum / forms.py

diff --git a/forum/forms.py b/forum/forms.py
index 93a4d15b9c586f1bea71975c66687db0b8cb6b4d..b54d65b1d133b03b70f5db84dc0ae06ede96b8b7 100644 (file)
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -2,14 +2,13 @@ import re
 from datetime import date
 from django import forms
 from models import *
 from datetime import date
 from django import forms
 from models import *

-from const import *

 from django.utils.translation import ugettext as _
 from django.utils.translation import ugettext as _

+from django.contrib.humanize.templatetags.humanize import apnumber

 from forum.models import User
 from forum.models import User

-from django.contrib.contenttypes.models import ContentType
+

 from django.utils.safestring import mark_safe
 from forum.utils.forms import NextUrlField, UserNameField, SetPasswordForm
 from django.utils.safestring import mark_safe
 from forum.utils.forms import NextUrlField, UserNameField, SetPasswordForm

-from django.conf import settings
-from django.contrib.contenttypes.models import ContentType
+from forum import settings

 import logging
 
 class TitleField(forms.CharField):
 import logging
 
 class TitleField(forms.CharField):


@@ -23,8 +22,8 @@ class TitleField(forms.CharField):
         self.initial = ''
 
     def clean(self, value):
         self.initial = ''
 
     def clean(self, value):

-        if len(value) < 10:
-            raise forms.ValidationError(_('title must be > 10 characters'))
+        if len(value) < settings.FORM_MIN_QUESTION_TITLE:
+            raise forms.ValidationError(_('title must be must be at least %s characters' % settings.FORM_MIN_QUESTION_TITLE))

 
         return value
 
 
         return value
 


@@ -38,8 +37,8 @@ class EditorField(forms.CharField):
         self.initial = ''
 
     def clean(self, value):
         self.initial = ''
 
     def clean(self, value):

-        if len(value) < 10:
-            raise forms.ValidationError(_('question content must be > 10 characters'))
+        if len(value) < settings.FORM_MIN_QUESTION_BODY and not settings.FORM_EMPTY_QUESTION_BODY:
+            raise forms.ValidationError(_('question content must be must be at least %s characters' % settings.FORM_MIN_QUESTION_BODY))

 
         return value
 
 
         return value
 


@@ -51,30 +50,32 @@ class TagNamesField(forms.CharField):
         self.max_length = 255
         self.label  = _('tags')
         #self.help_text = _('please use space to separate tags (this enables autocomplete feature)')
         self.max_length = 255
         self.label  = _('tags')
         #self.help_text = _('please use space to separate tags (this enables autocomplete feature)')

-        self.help_text = _('Tags are short keywords, with no spaces within. Up to five tags can be used.')
+        self.help_text = _('Tags are short keywords, with no spaces within. At least %(min)s and up to %(max)s tags can be used.') % {
+            'min': settings.FORM_MIN_NUMBER_OF_TAGS, 'max': settings.FORM_MAX_NUMBER_OF_TAGS    
+        }

         self.initial = ''
 
     def clean(self, value):
         value = super(TagNamesField, self).clean(value)
         data = value.strip()
         self.initial = ''
 
     def clean(self, value):
         value = super(TagNamesField, self).clean(value)
         data = value.strip()

-        if len(data) < 1:
-            raise forms.ValidationError(_('tags are required'))

 
         split_re = re.compile(r'[ ,]+')
         list = split_re.split(data)
 
         split_re = re.compile(r'[ ,]+')
         list = split_re.split(data)

-        list_temp = []
-        if len(list) > 5:
-            raise forms.ValidationError(_('please use 5 tags or less'))

 
 

+        if len(list) > settings.FORM_MAX_NUMBER_OF_TAGS or len(list) < settings.FORM_MIN_NUMBER_OF_TAGS:
+            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'[a-z0-9]+')
         for tag in list:
         tagname_re = re.compile(r'[a-z0-9]+')
         for tag in list:

-            if len(tag) > 20:
-                raise forms.ValidationError(_('tags must be shorter than 20 characters'))
+            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 \'a-z\', numbers, and characters \'.-_#\''))
             # only keep one same tag
             if tag not in list_temp and len(tag.strip()) > 0:
                 list_temp.append(tag)
             if not tagname_re.match(tag):
                 raise forms.ValidationError(_('please use following characters in tags: letters \'a-z\', numbers, and characters \'.-_#\''))
             # only keep one same tag
             if tag not in list_temp and len(tag.strip()) > 0:
                 list_temp.append(tag)

+

         return u' '.join(list_temp)
 
 class WikiField(forms.BooleanField):
         return u' '.join(list_temp)
 
 class WikiField(forms.BooleanField):


@@ -101,18 +102,6 @@ class SummaryField(forms.CharField):
         self.label  = _('update summary:')
         self.help_text = _('enter a brief summary of your revision (e.g. fixed spelling, grammar, improved style, this field is optional)')
 
         self.label  = _('update summary:')
         self.help_text = _('enter a brief summary of your revision (e.g. fixed spelling, grammar, improved style, this field is optional)')
 

-class ModerateUserForm(forms.ModelForm):
-    is_approved = forms.BooleanField(label=_("Automatically accept user's contributions for the email updates"),
-                                     required=False)
-
-    def clean_is_approved(self):
-        if 'is_approved' not in self.cleaned_data:
-            self.cleaned_data['is_approved'] = False
-        return self.cleaned_data['is_approved']
-
-    class Meta:
-        model = User
-        fields = ('is_approved',)

 
 class FeedbackForm(forms.Form):
     name = forms.CharField(label=_('Your name:'), required=False)
 
 class FeedbackForm(forms.Form):
     name = forms.CharField(label=_('Your name:'), required=False)


@@ -138,9 +127,6 @@ class AnswerForm(forms.Form):
             self.fields['wiki'].initial = True
 
 
             self.fields['wiki'].initial = True
 
 

-class CloseForm(forms.Form):
-    reason = forms.ChoiceField(choices=CLOSE_REASONS)
-

 class RetagQuestionForm(forms.Form):
     tags   = TagNamesField()
     # initialize the default values
 class RetagQuestionForm(forms.Form):
     tags   = TagNamesField()
     # initialize the default values


@@ -200,8 +186,6 @@ class EditAnswerForm(forms.Form):
 
 class EditUserForm(forms.Form):
     email = forms.EmailField(label=u'Email', help_text=_('this email does not have to be linked to gravatar'), required=True, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
 
 class EditUserForm(forms.Form):
     email = forms.EmailField(label=u'Email', help_text=_('this email does not have to be linked to gravatar'), required=True, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))

-    if settings.EDITABLE_SCREEN_NAME:
-       username = UserNameField(label=_('Screen name'))

     realname = forms.CharField(label=_('Real name'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
     website = forms.URLField(label=_('Website'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
     city = forms.CharField(label=_('Location'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
     realname = forms.CharField(label=_('Real name'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
     website = forms.URLField(label=_('Website'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
     city = forms.CharField(label=_('Location'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))


@@ -210,8 +194,8 @@ class EditUserForm(forms.Form):
 
     def __init__(self, user, *args, **kwargs):
         super(EditUserForm, self).__init__(*args, **kwargs)
 
     def __init__(self, user, *args, **kwargs):
         super(EditUserForm, self).__init__(*args, **kwargs)

-        logging.debug('initializing the form')

         if settings.EDITABLE_SCREEN_NAME:
         if settings.EDITABLE_SCREEN_NAME:

+            self.fields['username'] = UserNameField(label=_('Screen name'))

             self.fields['username'].initial = user.username
             self.fields['username'].user_instance = user
         self.fields['email'].initial = user.email
             self.fields['username'].initial = user.username
             self.fields['username'].user_instance = user
         self.fields['email'].initial = user.email


@@ -241,6 +225,12 @@ class EditUserForm(forms.Form):
                     raise forms.ValidationError(_('this email has already been registered, please use another one'))
         return self.cleaned_data['email']
 
                     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')),
+    ('n', _('No notifications')),
+)

 
 class SubscriptionSettingsForm(forms.Form):
     member_joins = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES)
 
 class SubscriptionSettingsForm(forms.Form):
     member_joins = forms.ChoiceField(widget=forms.RadioSelect, choices=NOTIFICATION_CHOICES)


@@ -261,3 +251,7 @@ class SubscriptionSettingsForm(forms.Form):
     notify_comments = forms.BooleanField(required=False, initial=False)
     notify_accepted = forms.BooleanField(required=False, initial=False)
 
     notify_comments = forms.BooleanField(required=False, initial=False)
     notify_accepted = forms.BooleanField(required=False, initial=False)
 

+
+class AwardPointsForm(forms.Form):
+    points = forms.IntegerField(min_value=1, initial=50, label=_('Points to award'))
+    message = forms.CharField(widget=forms.Textarea(), label=_('Message'), required=False)