Mercurial > kallithea
diff pylons_app/model/db.py @ 417:3ed2d46a2ca7
permission refactoring,
Implemented views for default permissions,
fixes #23 user registration is controlled by permission system.
Implemented manual registration option
websetup fills default permissions
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 21 Aug 2010 16:34:37 +0200 |
parents | 27f801e03489 |
children | d66a7fa7689b |
line wrap: on
line diff
--- a/pylons_app/model/db.py Fri Aug 20 18:43:08 2010 +0200 +++ b/pylons_app/model/db.py Sat Aug 21 16:34:37 2010 +0200 @@ -34,13 +34,14 @@ last_login = Column("last_login", DATETIME(timezone=False), nullable=True, unique=None, default=None) user_log = relation('UserLog') + user_perms = relation('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id") @LazyProperty def full_contact(self): return '%s %s <%s>' % (self.name, self.lastname, self.email) def __repr__(self): - return "<User('%s:%s')>" % (self.user_id, self.username) + return "<User('id:%s:%s')>" % (self.user_id, self.username) class UserLog(Base): __tablename__ = 'user_logs' @@ -66,6 +67,9 @@ user = relation('User') repo_to_perm = relation('RepoToPerm', cascade='all') + def __repr__(self): + return "<Repository('id:%s:%s')>" % (self.repo_id, self.repo_name) + class Permission(Base): __tablename__ = 'permissions' __table_args__ = {'useexisting':True}