Mercurial > kallithea
diff pylons_app/model/db.py @ 296:29370bb76fa6
first permissions commit: added permission managment on repository edit. Changed db rmissions, validators.
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Fri, 25 Jun 2010 02:09:33 +0200 |
parents | 0e5455fda8fd |
children | 3a66e7421a99 |
line wrap: on
line diff
--- a/pylons_app/model/db.py Fri Jun 25 02:06:45 2010 +0200 +++ b/pylons_app/model/db.py Fri Jun 25 02:09:33 2010 +0200 @@ -28,28 +28,44 @@ class UserLog(Base): __tablename__ = 'user_logs' __table_args__ = {'useexisting':True} - user_log_id = Column("user_log_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1) + user_log_id = Column("user_log_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True) user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=None, default=None) - repository = Column("repository", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + user_ip = Column("user_ip", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + repository = Column("repository", TEXT(length=None, convert_unicode=False, assert_unicode=None), ForeignKey(u'repositories.repo_name'), nullable=False, unique=None, default=None) action = Column("action", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) action_date = Column("action_date", DATETIME(timezone=False), nullable=True, unique=None, default=None) user = relation('User') - + class Repository(Base): __tablename__ = 'repositories' + __table_args__ = {'useexisting':True} repo_name = Column("repo_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None, primary_key=True) user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=False, default=None) private = Column("private", BOOLEAN(), nullable=True, unique=None, default=None) description = Column("description", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + user = relation('User') + repo2perm = relation('Repo2Perm', cascade='all') class Permission(Base): __tablename__ = 'permissions' __table_args__ = {'useexisting':True} - permission_id = Column("id", INTEGER(), nullable=False, unique=True, default=None, primary_key=1) + permission_id = Column("permission_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True) permission_name = Column("permission_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) permission_longname = Column("permission_longname", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) def __repr__(self): return "<Permission('%s:%s')>" % (self.permission_id, self.permission_name) + +class Repo2Perm(Base): + __tablename__ = 'repo_to_perm' + __table_args__ = (UniqueConstraint('user_id', 'permission_id', 'repository'), {'useexisting':True}) + repo2perm_id = Column("repo2perm_id", INTEGER(), nullable=False, unique=True, default=None, primary_key=True) + user_id = Column("user_id", INTEGER(), ForeignKey(u'users.user_id'), nullable=False, unique=None, default=None) + permission_id = Column("permission_id", INTEGER(), ForeignKey(u'permissions.permission_id'), nullable=False, unique=None, default=None) + repository = Column("repository", TEXT(length=None, convert_unicode=False, assert_unicode=None), ForeignKey(u'repositories.repo_name'), nullable=False, unique=None, default=None) + + user = relation('User') + permission = relation('Permission') +