From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Thu, 13 May 2010 01:43:19 +0000 (+0000)
Subject: Besides making an option to make usernames to be editable, is also good that users... 
X-Git-Tag: live~880
X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/c5bc10247ac31142957ebf9d688993a582635985

Besides making an option to make usernames to be editable, is also good that users can actually edit it.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@249 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/forms.py b/forum/forms.py
index 978ef17..c644b04 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -188,8 +188,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}))
-    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}))
@@ -198,8 +196,8 @@ class EditUserForm(forms.Form):
 
     def __init__(self, user, *args, **kwargs):
         super(EditUserForm, self).__init__(*args, **kwargs)
-        logging.debug('initializing the form')
         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
diff --git a/forum/skins/default/templates/users/edit.html b/forum/skins/default/templates/users/edit.html
index b3a7e74..bdd0921 100644
--- a/forum/skins/default/templates/users/edit.html
+++ b/forum/skins/default/templates/users/edit.html
@@ -55,7 +55,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 form.username %}
+	            	    {{ form.username }} <span class="form-error"></span> {{ form.username.errors }}
+	            	{% else %}
+	            	    {{ request.user.username }}
+	            	{% endif %}
+	            	</td>
 	            </tr>
                 
 	            <tr style="height:35px">