Fix OSQA-819: Link to profile in message is wrong if OSQA is installed in a subfolder

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

diff --git a/forum/forms/qanda.py b/forum/forms/qanda.py
index 98906400a5d2da211136303f8944899060513203..ea75ddd59c577e1ecf09ebdd97b9dfecb4ccf198 100644 (file)
--- a/forum/forms/qanda.py
+++ b/forum/forms/qanda.py
@@ -3,11 +3,11 @@ from datetime import date
 from django import forms
 from forum.models import *
 from django.utils.translation import ugettext as _
 from django import forms
 from forum.models import *
 from django.utils.translation import ugettext as _

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

 
 

-from django.utils.safestring import mark_safe
-from general import NextUrlField, UserNameField, SetPasswordForm
-from forum import settings
+from django.utils.encoding import smart_unicode
+from general import NextUrlField, UserNameField
+
+from forum import settings, REQUEST_HOLDER

 
 from forum.modules import call_all_handlers
 
 
 from forum.modules import call_all_handlers
 


@@ -16,14 +16,17 @@ import logging
 class TitleField(forms.CharField):
     def __init__(self, *args, **kwargs):
         super(TitleField, self).__init__(*args, **kwargs)
 class TitleField(forms.CharField):
     def __init__(self, *args, **kwargs):
         super(TitleField, self).__init__(*args, **kwargs)

+

         self.required = True
         self.required = True

-        self.widget = forms.TextInput(attrs={'size' : 70, 'autocomplete' : 'off'})

         self.max_length = 255
         self.max_length = 255

+        self.widget = forms.TextInput(attrs={'size' : 70, 'autocomplete' : 'off', 'maxlength' : self.max_length})

         self.label  = _('title')
         self.help_text = _('please enter a descriptive title for your question')
         self.initial = ''
 
     def clean(self, value):
         self.label  = _('title')
         self.help_text = _('please enter a descriptive title for your question')
         self.initial = ''
 
     def clean(self, value):

+        super(TitleField, self).clean(value)
+

         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)
 
         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)
 


@@ -32,6 +35,7 @@ class TitleField(forms.CharField):
 class EditorField(forms.CharField):
     def __init__(self, *args, **kwargs):
         super(EditorField, self).__init__(*args, **kwargs)
 class EditorField(forms.CharField):
     def __init__(self, *args, **kwargs):
         super(EditorField, self).__init__(*args, **kwargs)

+

         self.widget = forms.Textarea(attrs={'id':'editor'})
         self.label  = _('content')
         self.help_text = u''
         self.widget = forms.Textarea(attrs={'id':'editor'})
         self.label  = _('content')
         self.help_text = u''


@@ -45,6 +49,8 @@ class QuestionEditorField(EditorField):
 
 
     def clean(self, value):
 
 
     def clean(self, value):

+        super(QuestionEditorField, self).clean(value)
+

         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)
 
         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)
 


@@ -56,6 +62,8 @@ class AnswerEditorField(EditorField):
         self.required = True
 
     def clean(self, value):
         self.required = True
 
     def clean(self, value):

+        super(AnswerEditorField, self).clean(value)
+

         if len(re.sub('[ ]{2,}', ' ', value)) < settings.FORM_MIN_QUESTION_BODY:
             raise forms.ValidationError(_('answer content must be at least %s characters') % settings.FORM_MIN_QUESTION_BODY)
 
         if len(re.sub('[ ]{2,}', ' ', value)) < settings.FORM_MIN_QUESTION_BODY:
             raise forms.ValidationError(_('answer content must be at least %s characters') % settings.FORM_MIN_QUESTION_BODY)
 


@@ -65,6 +73,7 @@ class AnswerEditorField(EditorField):
 class TagNamesField(forms.CharField):
     def __init__(self, user=None, *args, **kwargs):
         super(TagNamesField, self).__init__(*args, **kwargs)
 class TagNamesField(forms.CharField):
     def __init__(self, user=None, *args, **kwargs):
         super(TagNamesField, self).__init__(*args, **kwargs)

+

         self.required = True
         self.widget = forms.TextInput(attrs={'size' : 50, 'autocomplete' : 'off'})
         self.max_length = 255
         self.required = True
         self.widget = forms.TextInput(attrs={'size' : 50, 'autocomplete' : 'off'})
         self.max_length = 255


@@ -77,6 +86,8 @@ class TagNamesField(forms.CharField):
         self.user = user
 
     def clean(self, value):
         self.user = user
 
     def clean(self, value):

+        super(TagNamesField, self).clean(value)
+

         value = super(TagNamesField, self).clean(value)
         data = value.strip().lower()
 
         value = super(TagNamesField, self).clean(value)
         data = value.strip().lower()
 


@@ -89,12 +100,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 = []
             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 key,tag in list.items():
             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):
         for key,tag in list.items():
             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 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)
             # only keep one same tag
             if tag not in list_temp and len(tag.strip()) > 0:
                 list_temp.append(tag)


@@ -147,6 +158,17 @@ class FeedbackForm(forms.Form):
             self.fields['name'] = forms.CharField(label=_('Your name:'), required=False)
             self.fields['email'] = forms.EmailField(label=_('Email (not shared with anyone):'), required=True)
 
             self.fields['name'] = forms.CharField(label=_('Your name:'), required=False)
             self.fields['email'] = forms.EmailField(label=_('Email (not shared with anyone):'), required=True)
 

+        # Create anti spam fields
+        spam_fields = call_all_handlers('create_anti_spam_field')
+        if spam_fields:
+            spam_fields = dict(spam_fields)
+            for name, field in spam_fields.items():
+                self.fields[name] = field
+
+            self._anti_spam_fields = spam_fields.keys()
+        else:
+            self._anti_spam_fields = []
+

 
 
 class AskForm(forms.Form):
 
 
 class AskForm(forms.Form):


@@ -158,7 +180,7 @@ class AskForm(forms.Form):
 
         self.fields['tags']   = TagNamesField(user)
         
 
         self.fields['tags']   = TagNamesField(user)
         

-        if int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff):
+        if not user.is_authenticated() or (int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff)):

             spam_fields = call_all_handlers('create_anti_spam_field')
             if spam_fields:
                 spam_fields = dict(spam_fields)
             spam_fields = call_all_handlers('create_anti_spam_field')
             if spam_fields:
                 spam_fields = dict(spam_fields)


@@ -179,7 +201,7 @@ class AnswerForm(forms.Form):
     def __init__(self, data=None, user=None, *args, **kwargs):
         super(AnswerForm, self).__init__(data, *args, **kwargs)
         
     def __init__(self, data=None, user=None, *args, **kwargs):
         super(AnswerForm, self).__init__(data, *args, **kwargs)
         

-        if int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff):
+        if not user.is_authenticated() or (int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff)):

             spam_fields = call_all_handlers('create_anti_spam_field')
             if spam_fields:
                 spam_fields = dict(spam_fields)
             spam_fields = call_all_handlers('create_anti_spam_field')
             if spam_fields:
                 spam_fields = dict(spam_fields)


@@ -213,7 +235,7 @@ class RevisionForm(forms.Form):
 
         date_format = '%c'
         self.fields['revision'].choices = [
 
         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]))
+            (r[0], u'%s - %s (%s) %s' % (r[0], smart_unicode(r[1]), r[2].strftime(date_format), r[3]))

             for r in revisions]
 
         self.fields['revision'].initial = post.active_revision.revision
             for r in revisions]
 
         self.fields['revision'].initial = post.active_revision.revision


@@ -235,7 +257,7 @@ class EditQuestionForm(forms.Form):
         self.fields['tags'] = TagNamesField(user)
         self.fields['tags'].initial = revision.tagnames
 
         self.fields['tags'] = TagNamesField(user)
         self.fields['tags'].initial = revision.tagnames
 

-        if int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff):
+        if not user.is_authenticated() or (int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff)):

             spam_fields = call_all_handlers('create_anti_spam_field')
             if spam_fields:
                 spam_fields = dict(spam_fields)
             spam_fields = call_all_handlers('create_anti_spam_field')
             if spam_fields:
                 spam_fields = dict(spam_fields)


@@ -261,7 +283,7 @@ class EditAnswerForm(forms.Form):
 
         self.fields['text'].initial = revision.body
 
 
         self.fields['text'].initial = revision.body
 

-        if int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff):
+        if not user.is_authenticated() or (int(user.reputation) < settings.CAPTCHA_IF_REP_LESS_THAN and not (user.is_superuser or user.is_staff)):

             spam_fields = call_all_handlers('create_anti_spam_field')
             if spam_fields:
                 spam_fields = dict(spam_fields)
             spam_fields = call_all_handlers('create_anti_spam_field')
             if spam_fields:
                 spam_fields = dict(spam_fields)


@@ -285,7 +307,7 @@ 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)

-        if settings.EDITABLE_SCREEN_NAME:
+        if settings.EDITABLE_SCREEN_NAME or (REQUEST_HOLDER.request.user.is_authenticated() and REQUEST_HOLDER.request.user.is_superuser):

             self.fields['username'] = UserNameField(label=_('Screen name'))
             self.fields['username'].initial = user.username
             self.fields['username'].user_instance = user
             self.fields['username'] = UserNameField(label=_('Screen name'))
             self.fields['username'].initial = user.username
             self.fields['username'].user_instance = user


@@ -296,14 +318,13 @@ class EditUserForm(forms.Form):
 
         if user.date_of_birth is not None:
             self.fields['birthday'].initial = user.date_of_birth
 
         if user.date_of_birth is not None:
             self.fields['birthday'].initial = user.date_of_birth

-        else:
-            self.fields['birthday'].initial = '1990-01-01'
+

         self.fields['about'].initial = user.about
         self.user = user
 
     def clean_email(self):
         if self.user.email != self.cleaned_data['email']:
         self.fields['about'].initial = user.about
         self.user = user
 
     def clean_email(self):
         if self.user.email != self.cleaned_data['email']:

-            if settings.EMAIL_UNIQUE == True:
+            if settings.EMAIL_UNIQUE:

                 if 'email' in self.cleaned_data:
                     from forum.models import User
                     try:
                 if 'email' in self.cleaned_data:
                     from forum.models import User
                     try:


@@ -333,6 +354,7 @@ class SubscriptionSettingsForm(forms.ModelForm):
 
     class Meta:
         model = SubscriptionSettings
 
     class Meta:
         model = SubscriptionSettings

+        fields = ['enable_notifications', 'member_joins', 'new_question', 'new_question_watched_tags', 'subscribed_questions']

 
 class UserPreferencesForm(forms.Form):
     sticky_sorts = forms.BooleanField(required=False, initial=False)
 
 class UserPreferencesForm(forms.Form):
     sticky_sorts = forms.BooleanField(required=False, initial=False)