Skip to content

Commit

Permalink
fix #2234 and #2232 Edits profil information
Browse files Browse the repository at this point in the history
  • Loading branch information
@GerardPaligot
GerardPaligot committed Feb 7, 2015
1 parent 93abd48 commit 947c1e6
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 39 deletions.
2 changes: 1 addition & 1 deletion zds/member/commons.py
View file
Expand Up @@ -51,7 +51,7 @@ def validate_username(self, value):
elif User.objects.filter(username=value).count() > 0:
msg = _(u'Ce nom d\'utilisateur est déjà utilisé')
if msg is not None:
self.throw_error("username", msg)
self.throw_error('username', msg)
return value


Expand Down
16 changes: 8 additions & 8 deletions zds/member/forms.py
View file
Expand Up @@ -294,7 +294,7 @@ def __init__(self, *args, **kwargs):
# to update email/username
class ChangeUserForm(forms.Form, ProfileUsernameValidator, ProfileEmailValidator):

username_new = forms.CharField(
username = forms.CharField(
label=_(u'Nouveau pseudo'),
max_length=User._meta.get_field('username').max_length,
min_length=1,
Expand All @@ -306,7 +306,7 @@ class ChangeUserForm(forms.Form, ProfileUsernameValidator, ProfileEmailValidator
)
)

email_new = forms.EmailField(
email = forms.EmailField(
label=_(u'Nouvelle adresse courriel'),
max_length=User._meta.get_field('email').max_length,
required=False,
Expand All @@ -325,8 +325,8 @@ def __init__(self, *args, **kwargs):
self.helper.form_method = 'post'

self.helper.layout = Layout(
Field('username_new'),
Field('email_new'),
Field('username'),
Field('email'),
ButtonHolder(
StrictButton(_(u'Enregistrer'), type='submit'),
),
Expand All @@ -335,12 +335,12 @@ def __init__(self, *args, **kwargs):
def clean(self):
cleaned_data = super(ChangeUserForm, self).clean()

username_new = cleaned_data.get('username_new')
if username_new is not None and not username_new.strip() == '':
username_new = cleaned_data.get('username')
if username_new is not None:
self.validate_username(username_new)

email_new = cleaned_data.get('email_new')
if email_new is not None and not email_new.strip() == '':
email_new = cleaned_data.get('email')
if email_new is not None:
self.validate_email(email_new)

return cleaned_data
Expand Down
48 changes: 24 additions & 24 deletions zds/member/tests/tests_forms.py
View file
Expand Up @@ -266,94 +266,94 @@ def setUp(self):

def test_valid_change_pseudo_user_form(self):
data = {
'username_new': "MyNewPseudo",
'email_new': ''
'username': "MyNewPseudo",
'email': ''
}
form = ChangeUserForm(data=data)
self.assertTrue(form.is_valid())

def test_valid_change_email_user_form(self):
data = {
'username_new': '',
'email_new': 'test@gmail.com'
'username': '',
'email': 'test@gmail.com'
}
form = ChangeUserForm(data=data)
self.assertTrue(form.is_valid())

def test_already_used_username_user_form(self):
data = {
'username_new': self.user1.user.username,
'email_new': ''
'username': self.user1.user.username,
'email': ''
}
form = ChangeUserForm(data=data)
self.assertFalse(form.is_valid())

def test_already_used_email_user_form(self):
data = {
'username_new': '',
'email_new': self.user1.user.email
'username': '',
'email': self.user1.user.email
}
form = ChangeUserForm(data=data)
self.assertFalse(form.is_valid())

def test_forbidden_email_provider_user_form(self):
data = {
'username_new': '',
'email_new': 'test@yopmail.com'
'username': '',
'email': 'test@yopmail.com'
}
form = ChangeUserForm(data=data)
self.assertFalse(form.is_valid())

def test_wrong_email_user_form(self):
data = {
'username_new': '',
'email_new': 'wrong@'
'username': '',
'email': 'wrong@'
}
form = ChangeUserForm(data=data)
self.assertFalse(form.is_valid())

data = {
'username_new': '',
'email_new': '@test.com'
'username': '',
'email': '@test.com'
}
form = ChangeUserForm(data=data)
self.assertFalse(form.is_valid())

data = {
'username_new': '',
'email_new': 'wrong@test'
'username': '',
'email': 'wrong@test'
}
form = ChangeUserForm(data=data)
self.assertFalse(form.is_valid())

data = {
'username_new': '',
'email_new': 'wrong@.com'
'username': '',
'email': 'wrong@.com'
}
form = ChangeUserForm(data=data)
self.assertFalse(form.is_valid())

data = {
'username_new': '',
'email_new': 'wrongtest.com'
'username': '',
'email': 'wrongtest.com'
}
form = ChangeUserForm(data=data)
self.assertFalse(form.is_valid())

def test_pseudo_espaces_register_form(self):
ProfileFactory()
data = {
'username_new': ' ZeTester ',
'email_new': ''
'username': ' ZeTester ',
'email': ''
}
form = ChangeUserForm(data=data)
self.assertFalse(form.is_valid())

def test_pseudo_coma_register_form(self):
ProfileFactory()
data = {
'username_new': 'Ze,Tester',
'email_new': ''
'username': 'Ze,Tester',
'email': ''
}
form = ChangeUserForm(data=data)
self.assertFalse(form.is_valid())
Expand Down
12 changes: 6 additions & 6 deletions zds/member/views.py
View file
Expand Up @@ -124,7 +124,7 @@ def form_valid(self, form):
self.update_profile(profile, form)
self.save_profile(profile)

return super(UpdateMember, self).form_valid(form)
return redirect(self.get_success_url())

def update_profile(self, profile, form):
cleaned_data_options = form.cleaned_data.get('options')
Expand Down Expand Up @@ -206,11 +206,11 @@ def get_form(self, form_class):
return form_class(self.request.POST)

def update_profile(self, profile, form):
if form.data['username_new']:
profile.user.username = form.data['username_new']
elif form.data['email_new']:
if form.data['email_new'].strip() != '':
profile.user.email = form.data['email_new']
if form.data['username']:
profile.user.username = form.data['username']
if form.data['email']:
if form.data['email'].strip() != '':
profile.user.email = form.data['email']

def get_success_url(self):
profile = self.get_object()
Expand Down

0 comments on commit 947c1e6

Please sign in to comment.