diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-11-16 13:51:14 -0500 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2010-11-16 13:52:51 -0500 |
| commit | e774f02303bc7d027633554b143c28252e3f5d71 (patch) | |
| tree | db60243a7fa8bd9812f6b01fc3b1ba095eb7d9e7 | |
| parent | 987c4af02f9f97d866fb0748c111701b7b2160cf (diff) | |
| download | askbot-e774f02303bc7d027633554b143c28252e3f5d71.tar.gz askbot-e774f02303bc7d027633554b143c28252e3f5d71.tar.bz2 askbot-e774f02303bc7d027633554b143c28252e3f5d71.zip | |
fixed a bug with editable screen name setting
| -rw-r--r-- | askbot/__init__.py | 2 | ||||
| -rw-r--r-- | askbot/forms.py | 3 | ||||
| -rw-r--r-- | askbot/skins/default/templates/user_edit.html | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/askbot/__init__.py b/askbot/__init__.py index 07ae95f4..8098eeda 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -22,7 +22,7 @@ def get_version(): """returns version of the askbot app this version is meaningful for pypi only """ - return '0.6.28' + return '0.6.29' #todo: maybe send_mail functions belong to models #or the future API diff --git a/askbot/forms.py b/askbot/forms.py index 86c96696..c72fb7cd 100644 --- a/askbot/forms.py +++ b/askbot/forms.py @@ -452,8 +452,6 @@ class EditUserForm(forms.Form): widget=forms.TextInput(attrs={'size' : 35}) ) - if askbot_settings.EDITABLE_SCREEN_NAME: - username = UserNameField(label=_('Screen name')) realname = forms.CharField( label=_('Real name'), required=False, @@ -492,6 +490,7 @@ class EditUserForm(forms.Form): super(EditUserForm, self).__init__(*args, **kwargs) logging.debug('initializing the form') if askbot_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 diff --git a/askbot/skins/default/templates/user_edit.html b/askbot/skins/default/templates/user_edit.html index 3f8541e4..ecdc8809 100644 --- a/askbot/skins/default/templates/user_edit.html +++ b/askbot/skins/default/templates/user_edit.html @@ -28,10 +28,11 @@ <td> {% if settings.EDITABLE_SCREEN_NAME %} {{ form.username }} + <span class="form-error"></span> {{ form.username.errors }} </td> {% else %} {{ request.user.username }} {% endif %} - <span class="form-error"></span> {{ form.username.errors }} </td> + </td> </tr> <tr style="height:35px"> <td>{{ form.email.label_tag() }}:</td> |