diff options
| -rw-r--r-- | forum/context.py | 1 | ||||
| -rwxr-xr-x | forum/forms.py | 2 | ||||
| -rw-r--r-- | forum/skins/default/templates/user_edit.html | 8 | ||||
| -rwxr-xr-x | forum/views/users.py | 4 |
4 files changed, 12 insertions, 3 deletions
diff --git a/forum/context.py b/forum/context.py index d8f1d838..043af81d 100644 --- a/forum/context.py +++ b/forum/context.py @@ -16,6 +16,7 @@ def application_settings(context): 'WIKI_ON':settings.WIKI_ON, 'RESOURCE_REVISION':settings.RESOURCE_REVISION, 'ASKBOT_SKIN':settings.ASKBOT_DEFAULT_SKIN, + 'EDITABLE_SCREEN_NAME':settings.EDITABLE_SCREEN_NAME, } return {'settings':my_settings} diff --git a/forum/forms.py b/forum/forms.py index d577e69a..e16db2c6 100755 --- a/forum/forms.py +++ b/forum/forms.py @@ -204,7 +204,7 @@ 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})) if settings.EDITABLE_SCREEN_NAME: - username = UserNameField(label=_('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})) diff --git a/forum/skins/default/templates/user_edit.html b/forum/skins/default/templates/user_edit.html index 8109949f..abbce58a 100644 --- a/forum/skins/default/templates/user_edit.html +++ b/forum/skins/default/templates/user_edit.html @@ -38,7 +38,13 @@ </tr>
<tr style="height:35px">
<td>{% trans "Screen Name" %}:</td>
- <td>{{ request.user.username }} <span class="form-error"></span> {{ form.username.errors }} </td>
+ <td>
+ {% if settings.EDITABLE_SCREEN_NAME %}
+ {{ form.username }}
+ {% else %}
+ {{ request.user.username }}
+ {% endif %}
+ <span class="form-error"></span> {{ form.username.errors }} </td>
</tr>
<tr style="height:35px">
diff --git a/forum/views/users.py b/forum/views/users.py index c5ecd6be..705bbbb0 100755 --- a/forum/views/users.py +++ b/forum/views/users.py @@ -17,6 +17,7 @@ from forum import auth import calendar from django.contrib.contenttypes.models import ContentType from forum.models import user_updated +from django.conf import settings question_type = ContentType.objects.get_for_model(Question) answer_type = ContentType.objects.get_for_model(Answer) @@ -121,7 +122,8 @@ def edit_user(request, id): set_new_email(user, new_email) - #user.username = sanitize_html(form.cleaned_data['username']) + if settings.EDITABLE_SCREEN_NAME: + 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']) |