Mercurial > kallithea
comparison rhodecode/model/db.py @ 3370:fdb0f59b2189 beta
fixes #762, LDAP and container created users are now activated based on
the registration settings in permissions
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 14 Feb 2013 23:34:59 +0100 |
| parents | 14556b463177 |
| children | 5706f6ab60cf |
comparison
equal
deleted
inserted
replaced
| 3369:667630c98eaa | 3370:fdb0f59b2189 |
|---|---|
| 396 return '%s %s' % (self.firstname, self.lastname) | 396 return '%s %s' % (self.firstname, self.lastname) |
| 397 | 397 |
| 398 @property | 398 @property |
| 399 def is_admin(self): | 399 def is_admin(self): |
| 400 return self.admin | 400 return self.admin |
| 401 | |
| 402 @property | |
| 403 def AuthUser(self): | |
| 404 """ | |
| 405 Returns instance of AuthUser for this user | |
| 406 """ | |
| 407 from rhodecode.lib.auth import AuthUser | |
| 408 return AuthUser(user_id=self.user_id, api_key=self.api_key, | |
| 409 username=self.username) | |
| 401 | 410 |
| 402 def __unicode__(self): | 411 def __unicode__(self): |
| 403 return u"<%s('id:%s:%s')>" % (self.__class__.__name__, | 412 return u"<%s('id:%s:%s')>" % (self.__class__.__name__, |
| 404 self.user_id, self.username) | 413 self.user_id, self.username) |
| 405 | 414 |