Users no long are allowed to change their username, and the email address is now a required field.

3 files changed, 414 insertions, 414 deletions

diff --git a/forum/forms.py b/forum/forms.py
index 376f5ddf..d727440e 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -1,318 +1,318 @@
-import re
-from datetime import date
-from django import forms
-from models import *
-from const import *
-from django.utils.translation import ugettext as _
-from django_authopenid.forms import NextUrlField, UserNameField
-import settings
-
-class TitleField(forms.CharField):
-    def __init__(self, *args, **kwargs):
-        super(TitleField, self).__init__(*args, **kwargs)
-        self.required = True
-        self.widget = forms.TextInput(attrs={'size' : 70, 'autocomplete' : 'off'})
-        self.max_length = 255
-        self.label  = _('title')
-        self.help_text = _('please enter a descriptive title for your question')
-        self.initial = ''
-
-    def clean(self, value):
-        if len(value) < 10:
-            raise forms.ValidationError(_('title must be > 10 characters'))
-
-        return value
-
-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 = ''
-
-    def clean(self, value):
-        if len(value) < 10:
-            raise forms.ValidationError(_('question content must be > 10 characters'))
-
-        return value
-
-class TagNamesField(forms.CharField):
-    def __init__(self, *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.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.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)
-        list_temp = []
-        if len(list) > 5:
-            raise forms.ValidationError(_('please use 5 tags or less'))
-        for tag in list:
-            if len(tag) > 20:
-                raise forms.ValidationError(_('tags must be shorter than 20 characters'))
-            #take tag regex from settings
-            tagname_re = re.compile(r'[a-z0-9]+')
-            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):
-    def __init__(self, *args, **kwargs):
-        super(WikiField, self).__init__(*args, **kwargs)
-        self.required = False
-        self.label  = _('community wiki')
-        self.help_text = _('if you choose community wiki option, the question and answer do not generate points and name of author will not be shown')
-    def clean(self,value):
-        return value and settings.WIKI_ON
-
-class EmailNotifyField(forms.BooleanField):
-    def __init__(self, *args, **kwargs):
-        super(EmailNotifyField, self).__init__(*args, **kwargs)
-        self.required = False
-        self.widget.attrs['class'] = 'nomargin'
-
-class SummaryField(forms.CharField):
-    def __init__(self, *args, **kwargs):
-        super(SummaryField, self).__init__(*args, **kwargs)
-        self.required = False
-        self.widget = forms.TextInput(attrs={'size' : 50, 'autocomplete' : 'off'})
-        self.max_length = 300
-        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)
-    email = forms.EmailField(label=_('Email (not shared with anyone):'), required=False)
-    message = forms.CharField(label=_('Your message:'), max_length=800,widget=forms.Textarea(attrs={'cols':60}))
-    next = NextUrlField()
-
-class AskForm(forms.Form):
-    title  = TitleField()
-    text   = EditorField()
-    tags   = TagNamesField()
-    wiki = WikiField()
-
-    openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))
-    user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-
-class AnswerForm(forms.Form):
-    text   = EditorField()
-    wiki   = WikiField()
-    openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))
-    user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    email_notify = EmailNotifyField()
-    def __init__(self, question, user, *args, **kwargs):
-        super(AnswerForm, self).__init__(*args, **kwargs)
-        self.fields['email_notify'].widget.attrs['id'] = 'question-subscribe-updates';
-        if question.wiki and settings.WIKI_ON:
-            self.fields['wiki'].initial = True
-        if user.is_authenticated():
-            if user in question.followed_by.all():
-                self.fields['email_notify'].initial = True
-                return
-        self.fields['email_notify'].initial = False
-
-
-class CloseForm(forms.Form):
-    reason = forms.ChoiceField(choices=CLOSE_REASONS)
-
-class RetagQuestionForm(forms.Form):
-    tags   = TagNamesField()
-    # initialize the default values
-    def __init__(self, question, *args, **kwargs):
-        super(RetagQuestionForm, self).__init__(*args, **kwargs)
-        self.fields['tags'].initial = question.tagnames
-
-class RevisionForm(forms.Form):
-    """
-    Lists revisions of a Question or Answer
-    """
-    revision = forms.ChoiceField(widget=forms.Select(attrs={'style' : 'width:520px'}))
-
-    def __init__(self, post, latest_revision, *args, **kwargs):
-        super(RevisionForm, self).__init__(*args, **kwargs)
-        revisions = post.revisions.all().values_list(
-            'revision', 'author__username', 'revised_at', 'summary')
-        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]))
-            for r in revisions]
-        self.fields['revision'].initial = latest_revision.revision
-
-class EditQuestionForm(forms.Form):
-    title  = TitleField()
-    text   = EditorField()
-    tags   = TagNamesField()
-    summary = SummaryField()
-
-    def __init__(self, question, revision, *args, **kwargs):
-        super(EditQuestionForm, self).__init__(*args, **kwargs)
-        self.fields['title'].initial = revision.title
-        self.fields['text'].initial = revision.text
-        self.fields['tags'].initial = revision.tagnames
-        # Once wiki mode is enabled, it can't be disabled
-        if not question.wiki:
-            self.fields['wiki'] = WikiField()
-
-class EditAnswerForm(forms.Form):
-    text = EditorField()
-    summary = SummaryField()
-
-    def __init__(self, answer, revision, *args, **kwargs):
-        super(EditAnswerForm, self).__init__(*args, **kwargs)
-        self.fields['text'].initial = revision.text
-
-class EditUserForm(forms.Form):
-    email = forms.EmailField(label=u'Email', help_text=_('this email does not have to be linked to gravatar'), required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))
-    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}))
-    birthday = forms.DateField(label=_('Date of birth'), help_text=_('will not be shown, used to calculate age, format: YYYY-MM-DD'), required=False, widget=forms.TextInput(attrs={'size' : 35}))
-    about = forms.CharField(label=_('Profile'), required=False, widget=forms.Textarea(attrs={'cols' : 60}))
-
-    def __init__(self, user, *args, **kwargs):
-        super(EditUserForm, self).__init__(*args, **kwargs)
-        self.fields['username'].initial = user.username
-        self.fields['username'].user_instance = user
-        self.fields['email'].initial = user.email
-        self.fields['realname'].initial = user.real_name
-        self.fields['website'].initial = user.website
-        self.fields['city'].initial = user.location
-
-        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):
-        """For security reason one unique email in database"""
-        if self.user.email != self.cleaned_data['email']:
-            #todo dry it, there is a similar thing in openidauth
-            if settings.EMAIL_UNIQUE == True:
-                if 'email' in self.cleaned_data:
-                    try:
-                        user = User.objects.get(email = self.cleaned_data['email'])
-                    except User.DoesNotExist:
-                        return self.cleaned_data['email']
-                    except User.MultipleObjectsReturned:
-                        raise forms.ValidationError(_('this email has already been registered, please use another one'))
-                    raise forms.ValidationError(_('this email has already been registered, please use another one'))
-        return self.cleaned_data['email']
-
-class TagFilterSelectionForm(forms.ModelForm):
-    tag_filter_setting = forms.ChoiceField(choices=TAG_EMAIL_FILTER_CHOICES, #imported from forum/const.py
-                                            initial='ignored',
-                                            label=_('Choose email tag filter'),
-                                            widget=forms.RadioSelect)
-    class Meta:
-        model = User
-        fields = ('tag_filter_setting',)
-
-    def save(self):
-        before = self.instance.tag_filter_setting
-        super(TagFilterSelectionForm, self).save()
-        after = self.instance.tag_filter_setting #User.objects.get(pk=self.instance.id).tag_filter_setting
-        if before != after:
-            return True
-        return False
-
-class EditUserEmailFeedsForm(forms.Form):
-    WN = (('w',_('weekly')),('n',_('no email')))
-    DWN = (('d',_('daily')),('w',_('weekly')),('n',_('no email')))
-    FORM_TO_MODEL_MAP = {
-                'all_questions':'q_all',
-                'asked_by_me':'q_ask',
-                'answered_by_me':'q_ans',
-                'individually_selected':'q_sel',
-                }
-    NO_EMAIL_INITIAL = {
-                'all_questions':'n',
-                'asked_by_me':'n',
-                'answered_by_me':'n',
-                'individually_selected':'n',
-                }
-    asked_by_me = forms.ChoiceField(choices=DWN,initial='w',
-                            widget=forms.RadioSelect,
-                            label=_('Asked by me'))
-    answered_by_me = forms.ChoiceField(choices=DWN,initial='w',
-                            widget=forms.RadioSelect,
-                            label=_('Answered by me'))
-    individually_selected = forms.ChoiceField(choices=DWN,initial='w',
-                            widget=forms.RadioSelect,
-                            label=_('Individually selected'))
-    all_questions = forms.ChoiceField(choices=DWN,initial='w',
-                            widget=forms.RadioSelect,
-                            label=_('Entire forum (tag filtered)'),)
-
-    def set_initial_values(self,user=None):
-        KEY_MAP = dict([(v,k) for k,v in self.FORM_TO_MODEL_MAP.iteritems()])
-        if user != None:
-            settings = EmailFeedSetting.objects.filter(subscriber=user) 
-            initial_values = {}
-            for setting in settings:
-                feed_type = setting.feed_type
-                form_field = KEY_MAP[feed_type]
-                frequency = setting.frequency
-                initial_values[form_field] = frequency
-            self.initial = initial_values
-        return self
-
-    def reset(self):
-        self.cleaned_data['all_questions'] = 'n'
-        self.cleaned_data['asked_by_me'] = 'n'
-        self.cleaned_data['answered_by_me'] = 'n'
-        self.cleaned_data['individually_selected'] = 'n'
-        self.initial = self.NO_EMAIL_INITIAL
-        return self
-
-    def save(self,user):
-        changed = False
-        for form_field, feed_type in self.FORM_TO_MODEL_MAP.items():
-            s, created = EmailFeedSetting.objects.get_or_create(subscriber=user,\
-                                                    feed_type=feed_type)
-            new_value = self.cleaned_data[form_field]
-            if s.frequency != new_value:
-                s.frequency = self.cleaned_data[form_field]
-                s.save()
-                changed = True
-            else:
-                if created:
-                    s.save()
-            if form_field == 'individually_selected':
-                feed_type = ContentType.objects.get_for_model(Question)
-                user.followed_questions.clear()
-        return changed
+import re

+from datetime import date

+from django import forms

+from models import *

+from const import *

+from django.utils.translation import ugettext as _

+from django_authopenid.forms import NextUrlField, UserNameField

+import settings

+

+class TitleField(forms.CharField):

+    def __init__(self, *args, **kwargs):

+        super(TitleField, self).__init__(*args, **kwargs)

+        self.required = True

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

+        self.max_length = 255

+        self.label  = _('title')

+        self.help_text = _('please enter a descriptive title for your question')

+        self.initial = ''

+

+    def clean(self, value):

+        if len(value) < 10:

+            raise forms.ValidationError(_('title must be > 10 characters'))

+

+        return value

+

+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 = ''

+

+    def clean(self, value):

+        if len(value) < 10:

+            raise forms.ValidationError(_('question content must be > 10 characters'))

+

+        return value

+

+class TagNamesField(forms.CharField):

+    def __init__(self, *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.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.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)

+        list_temp = []

+        if len(list) > 5:

+            raise forms.ValidationError(_('please use 5 tags or less'))

+        for tag in list:

+            if len(tag) > 20:

+                raise forms.ValidationError(_('tags must be shorter than 20 characters'))

+            #take tag regex from settings

+            tagname_re = re.compile(r'[a-z0-9]+')

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

+    def __init__(self, *args, **kwargs):

+        super(WikiField, self).__init__(*args, **kwargs)

+        self.required = False

+        self.label  = _('community wiki')

+        self.help_text = _('if you choose community wiki option, the question and answer do not generate points and name of author will not be shown')

+    def clean(self,value):

+        return value and settings.WIKI_ON

+

+class EmailNotifyField(forms.BooleanField):

+    def __init__(self, *args, **kwargs):

+        super(EmailNotifyField, self).__init__(*args, **kwargs)

+        self.required = False

+        self.widget.attrs['class'] = 'nomargin'

+

+class SummaryField(forms.CharField):

+    def __init__(self, *args, **kwargs):

+        super(SummaryField, self).__init__(*args, **kwargs)

+        self.required = False

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

+        self.max_length = 300

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

+    email = forms.EmailField(label=_('Email (not shared with anyone):'), required=False)

+    message = forms.CharField(label=_('Your message:'), max_length=800,widget=forms.Textarea(attrs={'cols':60}))

+    next = NextUrlField()

+

+class AskForm(forms.Form):

+    title  = TitleField()

+    text   = EditorField()

+    tags   = TagNamesField()

+    wiki = WikiField()

+

+    openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))

+    user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))

+    email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))

+

+class AnswerForm(forms.Form):

+    text   = EditorField()

+    wiki   = WikiField()

+    openid = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 40, 'class':'openid-input'}))

+    user   = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))

+    email  = forms.CharField(required=False, max_length=255, widget=forms.TextInput(attrs={'size' : 35}))

+    email_notify = EmailNotifyField()

+    def __init__(self, question, user, *args, **kwargs):

+        super(AnswerForm, self).__init__(*args, **kwargs)

+        self.fields['email_notify'].widget.attrs['id'] = 'question-subscribe-updates';

+        if question.wiki and settings.WIKI_ON:

+            self.fields['wiki'].initial = True

+        if user.is_authenticated():

+            if user in question.followed_by.all():

+                self.fields['email_notify'].initial = True

+                return

+        self.fields['email_notify'].initial = False

+

+

+class CloseForm(forms.Form):

+    reason = forms.ChoiceField(choices=CLOSE_REASONS)

+

+class RetagQuestionForm(forms.Form):

+    tags   = TagNamesField()

+    # initialize the default values

+    def __init__(self, question, *args, **kwargs):

+        super(RetagQuestionForm, self).__init__(*args, **kwargs)

+        self.fields['tags'].initial = question.tagnames

+

+class RevisionForm(forms.Form):

+    """

+    Lists revisions of a Question or Answer

+    """

+    revision = forms.ChoiceField(widget=forms.Select(attrs={'style' : 'width:520px'}))

+

+    def __init__(self, post, latest_revision, *args, **kwargs):

+        super(RevisionForm, self).__init__(*args, **kwargs)

+        revisions = post.revisions.all().values_list(

+            'revision', 'author__username', 'revised_at', 'summary')

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

+            for r in revisions]

+        self.fields['revision'].initial = latest_revision.revision

+

+class EditQuestionForm(forms.Form):

+    title  = TitleField()

+    text   = EditorField()

+    tags   = TagNamesField()

+    summary = SummaryField()

+

+    def __init__(self, question, revision, *args, **kwargs):

+        super(EditQuestionForm, self).__init__(*args, **kwargs)

+        self.fields['title'].initial = revision.title

+        self.fields['text'].initial = revision.text

+        self.fields['tags'].initial = revision.tagnames

+        # Once wiki mode is enabled, it can't be disabled

+        if not question.wiki:

+            self.fields['wiki'] = WikiField()

+

+class EditAnswerForm(forms.Form):

+    text = EditorField()

+    summary = SummaryField()

+

+    def __init__(self, answer, revision, *args, **kwargs):

+        super(EditAnswerForm, self).__init__(*args, **kwargs)

+        self.fields['text'].initial = revision.text

+

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

+    #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}))

+    birthday = forms.DateField(label=_('Date of birth'), help_text=_('will not be shown, used to calculate age, format: YYYY-MM-DD'), required=False, widget=forms.TextInput(attrs={'size' : 35}))

+    about = forms.CharField(label=_('Profile'), required=False, widget=forms.Textarea(attrs={'cols' : 60}))

+

+    def __init__(self, user, *args, **kwargs):

+        super(EditUserForm, self).__init__(*args, **kwargs)

+        #self.fields['username'].initial = user.username

+        #self.fields['username'].user_instance = user

+        self.fields['email'].initial = user.email

+        self.fields['realname'].initial = user.real_name

+        self.fields['website'].initial = user.website

+        self.fields['city'].initial = user.location

+

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

+        """For security reason one unique email in database"""

+        if self.user.email != self.cleaned_data['email']:

+            #todo dry it, there is a similar thing in openidauth

+            if settings.EMAIL_UNIQUE == True:

+                if 'email' in self.cleaned_data:

+                    try:

+                        user = User.objects.get(email = self.cleaned_data['email'])

+                    except User.DoesNotExist:

+                        return self.cleaned_data['email']

+                    except User.MultipleObjectsReturned:

+                        raise forms.ValidationError(_('this email has already been registered, please use another one'))

+                    raise forms.ValidationError(_('this email has already been registered, please use another one'))

+        return self.cleaned_data['email']

+

+class TagFilterSelectionForm(forms.ModelForm):

+    tag_filter_setting = forms.ChoiceField(choices=TAG_EMAIL_FILTER_CHOICES, #imported from forum/const.py

+                                            initial='ignored',

+                                            label=_('Choose email tag filter'),

+                                            widget=forms.RadioSelect)

+    class Meta:

+        model = User

+        fields = ('tag_filter_setting',)

+

+    def save(self):

+        before = self.instance.tag_filter_setting

+        super(TagFilterSelectionForm, self).save()

+        after = self.instance.tag_filter_setting #User.objects.get(pk=self.instance.id).tag_filter_setting

+        if before != after:

+            return True

+        return False

+

+class EditUserEmailFeedsForm(forms.Form):

+    WN = (('w',_('weekly')),('n',_('no email')))

+    DWN = (('d',_('daily')),('w',_('weekly')),('n',_('no email')))

+    FORM_TO_MODEL_MAP = {

+                'all_questions':'q_all',

+                'asked_by_me':'q_ask',

+                'answered_by_me':'q_ans',

+                'individually_selected':'q_sel',

+                }

+    NO_EMAIL_INITIAL = {

+                'all_questions':'n',

+                'asked_by_me':'n',

+                'answered_by_me':'n',

+                'individually_selected':'n',

+                }

+    asked_by_me = forms.ChoiceField(choices=DWN,initial='w',

+                            widget=forms.RadioSelect,

+                            label=_('Asked by me'))

+    answered_by_me = forms.ChoiceField(choices=DWN,initial='w',

+                            widget=forms.RadioSelect,

+                            label=_('Answered by me'))

+    individually_selected = forms.ChoiceField(choices=DWN,initial='w',

+                            widget=forms.RadioSelect,

+                            label=_('Individually selected'))

+    all_questions = forms.ChoiceField(choices=DWN,initial='w',

+                            widget=forms.RadioSelect,

+                            label=_('Entire forum (tag filtered)'),)

+

+    def set_initial_values(self,user=None):

+        KEY_MAP = dict([(v,k) for k,v in self.FORM_TO_MODEL_MAP.iteritems()])

+        if user != None:

+            settings = EmailFeedSetting.objects.filter(subscriber=user) 

+            initial_values = {}

+            for setting in settings:

+                feed_type = setting.feed_type

+                form_field = KEY_MAP[feed_type]

+                frequency = setting.frequency

+                initial_values[form_field] = frequency

+            self.initial = initial_values

+        return self

+

+    def reset(self):

+        self.cleaned_data['all_questions'] = 'n'

+        self.cleaned_data['asked_by_me'] = 'n'

+        self.cleaned_data['answered_by_me'] = 'n'

+        self.cleaned_data['individually_selected'] = 'n'

+        self.initial = self.NO_EMAIL_INITIAL

+        return self

+

+    def save(self,user):

+        changed = False

+        for form_field, feed_type in self.FORM_TO_MODEL_MAP.items():

+            s, created = EmailFeedSetting.objects.get_or_create(subscriber=user,\

+                                                    feed_type=feed_type)

+            new_value = self.cleaned_data[form_field]

+            if s.frequency != new_value:

+                s.frequency = self.cleaned_data[form_field]

+                s.save()

+                changed = True

+            else:

+                if created:

+                    s.save()

+            if form_field == 'individually_selected':

+                feed_type = ContentType.objects.get_for_model(Question)

+                user.followed_questions.clear()

+        return changed

diff --git a/forum/views.py b/forum/views.py
index f5eb6598..04d9d497 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1235,7 +1235,7 @@ def edit_user(request, id):
             from django_authopenid.views import set_new_email

             set_new_email(user, new_email)

 

-            user.username = sanitize_html(form.cleaned_data['username'])

+            #user.username = sanitize_html(form.cleaned_data['username'])

             user.real_name = sanitize_html(form.cleaned_data['realname'])

             user.website = sanitize_html(form.cleaned_data['website'])

             user.location = sanitize_html(form.cleaned_data['city'])

diff --git a/templates/user_edit.html b/templates/user_edit.html
index 5886c071..bc5056f9 100644
--- a/templates/user_edit.html
+++ b/templates/user_edit.html
@@ -1,95 +1,95 @@
-{% extends "base_content.html" %}
-<!-- user_edit.html -->
-{% load extra_tags %}
-{% load humanize %}
-{% load i18n %}
-{% block title %}{% spaceless %}{% trans "Edit user profile" %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <script type="text/javascript">
-            $().ready(function(){
-                $("#nav_profile").attr('className',"on");
-                $("#cancel").bind('click', function(){history.go(-1);})
-            });     
-        </script>
-        {% block userjs %}
-        {% endblock %}
-{% endblock %}
-{% block content %}
-<div id="main-bar" class="headNormal">
-    {{ request.user.username }} - {% trans "edit profile" %}
-</div>
-<div id="main-body" style="width:100%;padding-top:10px">
-    <form name="" action="{% url edit_user request.user.id %}" method="post">
-        <div id="left" style="float:left;width:180px">
-            {% if request.user.email %}
-            {% gravatar request.user 128 %}
-            {% else %}
-            <img src="{% href "/content/images/nophoto.png" %}">
-            {% endif %}
-            <div style="padding:20px 0 0 20px;font-weight:bold;font-size:150%">
-                <a href="http://www.gravatar.com/" target="_blank" 
-					title="gravatar {% trans "image associated with your email address" %}">{% blocktrans %}avatar, see {{gravatar_faq_url}}{% endblocktrans %}</a>
-            </div>
-        </div>
-        
-        <div id="askform" style="float:right;width:750px;text-align:left;">
-            <h2>{% trans "Registered user" %}</h2>
-            <table class="user-details">
-                <tr>
-                    <th width="100px"></th>
-                    <th></th>
-                </tr>
-                <tr style="height:35px">
-	            	<td>{{ form.username.label_tag }}:</td>
-	            	<td>{{ form.username }} <span class="form-error"></span> {{ form.username.errors }} </td>
-	            </tr>
-                
-	            <tr style="height:35px">
-	            	<td>{{ form.email.label_tag }}:</td>
-	            	<td>{{ form.email }} <span class="form-error"></span> {{ form.email.errors }} </td>
-	            </tr>
-                <tr style="height:35px">
-	            	<td></td>
-	            	<td class="title-desc">{{ form.email.help_text }}</td>
-	            </tr>
-                <tr style="height:35px">
-	            	<td>{{ form.realname.label_tag }}:</td>
-	            	<td>{{ form.realname }} <span class="form-error"></span> {{ form.realname.errors }} </td>
-	            </tr>
-                <tr style="height:35px">
-	            	<td>{{ form.website.label_tag }}:</td>
-	            	<td>{{ form.website }} <span class="form-error"></span> {{ form.website.errors }} </td>
-	            </tr>
-                <tr style="height:35px">
-	            	<td>{{ form.city.label_tag }}:</td>
-	            	<td>{{ form.city }} <span class="form-error"></span> {{ form.city.errors }} </td>
-	            </tr>
-                <tr style="height:35px">
-	            	<td>{{ form.birthday.label_tag }}:</td>
-	            	<td>{{ form.birthday }} <span class="form-error"></span> {{ form.birthday.errors }} </td>
-	            </tr>
-                <tr style="height:35px">
-	            	<td></td>
-	            	<td class="title-desc">{{ form.birthday.help_text }}</td>
-	            </tr>
-                <tr style="height:10px">
-                    <td colspan="2">
-                    </td>
-                </tr>
-                <tr>
-	            	<td style="vertical-align:top">{{ form.about.label_tag }}:</td>
-	            	<td>{{ form.about }} <span class="form-error"></span> {{ form.about.errors }} </td>
-	            </tr>
-	            
-            </table>
-            <div style="margin:30px 0 60px 0">
-                <input type="submit" value="{% trans "Update" %}" class="submit" >
-                <input id="cancel" type="button" value="{% trans "Cancel" %}" class="submit" >
-          
-            </div>
-        </div>
-    </form>
-    
-</div>
-{% endblock %}
-<!-- end user_edit.html -->
+{% extends "base_content.html" %}

+<!-- user_edit.html -->

+{% load extra_tags %}

+{% load humanize %}

+{% load i18n %}

+{% block title %}{% spaceless %}{% trans "Edit user profile" %}{% endspaceless %}{% endblock %}

+{% block forejs %}

+        <script type="text/javascript">

+            $().ready(function(){

+                $("#nav_profile").attr('className',"on");

+                $("#cancel").bind('click', function(){history.go(-1);})

+            });     

+        </script>

+        {% block userjs %}

+        {% endblock %}

+{% endblock %}

+{% block content %}

+<div id="main-bar" class="headNormal">

+    {{ request.user.username }} - {% trans "edit profile" %}

+</div>

+<div id="main-body" style="width:100%;padding-top:10px">

+    <form name="" action="{% url edit_user request.user.id %}" method="post">

+        <div id="left" style="float:left;width:180px">

+            {% if request.user.email %}

+            {% gravatar request.user 128 %}

+            {% else %}

+            <img src="{% href "/content/images/nophoto.png" %}">

+            {% endif %}

+            <div style="padding:20px 0 0 20px;font-weight:bold;font-size:150%">

+                <a href="http://www.gravatar.com/" target="_blank" 

+					title="gravatar {% trans "image associated with your email address" %}">{% blocktrans %}avatar, see {{gravatar_faq_url}}{% endblocktrans %}</a>

+            </div>

+        </div>

+        

+        <div id="askform" style="float:right;width:750px;text-align:left;">

+            <h2>{% trans "Registered user" %}</h2>

+            <table class="user-details">

+                <tr>

+                    <th width="100px"></th>

+                    <th></th>

+                </tr>

+                <tr style="height:35px">

+	            	<td>{% trans "Screen Name" %}:</td>

+	            	<td>{{ request.user.username }} <span class="form-error"></span> {{ form.username.errors }} </td>

+	            </tr>

+                

+	            <tr style="height:35px">

+	            	<td>{{ form.email.label_tag }}:</td>

+	            	<td>{{ form.email }} <span class="form-error"></span> {{ form.email.errors }} </td>

+	            </tr>

+                <tr style="height:35px">

+	            	<td></td>

+	            	<td class="title-desc">{{ form.email.help_text }}</td>

+	            </tr>

+                <tr style="height:35px">

+	            	<td>{{ form.realname.label_tag }}:</td>

+	            	<td>{{ form.realname }} <span class="form-error"></span> {{ form.realname.errors }} </td>

+	            </tr>

+                <tr style="height:35px">

+	            	<td>{{ form.website.label_tag }}:</td>

+	            	<td>{{ form.website }} <span class="form-error"></span> {{ form.website.errors }} </td>

+	            </tr>

+                <tr style="height:35px">

+	            	<td>{{ form.city.label_tag }}:</td>

+	            	<td>{{ form.city }} <span class="form-error"></span> {{ form.city.errors }} </td>

+	            </tr>

+                <tr style="height:35px">

+	            	<td>{{ form.birthday.label_tag }}:</td>

+	            	<td>{{ form.birthday }} <span class="form-error"></span> {{ form.birthday.errors }} </td>

+	            </tr>

+                <tr style="height:35px">

+	            	<td></td>

+	            	<td class="title-desc">{{ form.birthday.help_text }}</td>

+	            </tr>

+                <tr style="height:10px">

+                    <td colspan="2">

+                    </td>

+                </tr>

+                <tr>

+	            	<td style="vertical-align:top">{{ form.about.label_tag }}:</td>

+	            	<td>{{ form.about }} <span class="form-error"></span> {{ form.about.errors }} </td>

+	            </tr>

+	            

+            </table>

+            <div style="margin:30px 0 60px 0">

+                <input type="submit" value="{% trans "Update" %}" class="submit" >

+                <input id="cancel" type="button" value="{% trans "Cancel" %}" class="submit" >

+          

+            </div>

+        </div>

+    </form>

+    

+</div>

+{% endblock %}

+<!-- end user_edit.html -->