Mercurial > kallithea
diff rhodecode/model/user.py @ 2544:6ce3387bf0ce beta
Renamed name to firstname in forms
- added multiple test for edit my account and edit user from admin
- fixed issues with update user accounts from admin
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Wed, 04 Jul 2012 18:13:25 +0200 |
parents | 17893d61792a |
children | 001c7e2ae986 |
line wrap: on
line diff
--- a/rhodecode/model/user.py Wed Jul 04 11:42:16 2012 +0200 +++ b/rhodecode/model/user.py Wed Jul 04 18:13:25 2012 +0200 @@ -96,6 +96,8 @@ for k, v in form_data.items(): if k == 'password': v = get_crypt_password(v) + if k == 'firstname': + k = 'name' setattr(new_user, k, v) new_user.api_key = generate_api_key(form_data['username']) @@ -264,12 +266,13 @@ " crucial for entire application")) for k, v in form_data.items(): - if k == 'new_password' and v != '': + if k == 'new_password' and v: user.password = get_crypt_password(v) user.api_key = generate_api_key(user.username) else: + if k == 'firstname': + k = 'name' setattr(user, k, v) - self.sa.add(user) except: log.error(traceback.format_exc()) @@ -285,10 +288,12 @@ " crucial for entire application") ) for k, v in form_data.items(): - if k == 'new_password' and v != '': + if k == 'new_password' and v: user.password = get_crypt_password(v) user.api_key = generate_api_key(user.username) else: + if k == 'firstname': + k = 'name' if k not in ['admin', 'active']: setattr(user, k, v)