diff options
| author | Marcin Kuzminski <marcin@python-works.com> | 2012-01-27 04:46:00 +0200 |
|---|---|---|
| committer | Marcin Kuzminski <marcin@python-works.com> | 2012-01-27 04:46:00 +0200 |
| commit | d2878fe1c09532afbeddd3ad5c78ae861703f2f9 (patch) | |
| tree | 8b2203ebd5df2a111f8ab2955c95eaf985693923 /rhodecode/model/user.py | |
| parent | 4e56083481cedd10388ddb4dc7840effc17bf201 (diff) | |
#344 optional firstname lastname on user creation
- on display fallback to username if both empty
--HG--
branch : beta
Diffstat (limited to 'rhodecode/model/user.py')
| -rw-r--r-- | rhodecode/model/user.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py index 7d95e90f..8ffb465b 100644 --- a/rhodecode/model/user.py +++ b/rhodecode/model/user.py @@ -92,7 +92,6 @@ class UserModel(BaseModel): log.error(traceback.format_exc()) raise - def create_or_update(self, username, password, email, name, lastname, active=True, admin=False, ldap_dn=None): """ @@ -136,7 +135,6 @@ class UserModel(BaseModel): log.error(traceback.format_exc()) raise - def create_for_container_auth(self, username, attrs): """ Creates the given user if it's not already in the database @@ -231,7 +229,7 @@ class UserModel(BaseModel): body = body % (new_user.username, new_user.full_name, new_user.email) edit_url = url('edit_user', id=new_user.user_id, qualified=True) - kw = {'registered_user_url':edit_url} + kw = {'registered_user_url': edit_url} NotificationModel().create(created_by=new_user, subject=subject, body=body, recipients=None, type_=Notification.TYPE_REGISTRATION, @@ -493,7 +491,6 @@ class UserModel(BaseModel): new.permission = perm self.sa.add(new) - def revoke_perm(self, user, perm): if not isinstance(perm, Permission): raise Exception('perm needs to be an instance of Permission class ' |