Mercurial > kallithea
diff rhodecode/model/db.py @ 704:26237de9b613 beta
Added settings model, and Exceptions lib.
Filled settings with ldap settings.
Extended user db models with is_ldap flag, and added easier construction of RhodeCode db settings
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 17 Nov 2010 21:29:02 +0100 |
| parents | cb0d9ce6ac5c |
| children | b9bbc0d6e9f3 |
line wrap: on
line diff
--- a/rhodecode/model/db.py Wed Nov 17 21:23:32 2010 +0100 +++ b/rhodecode/model/db.py Wed Nov 17 21:29:02 2010 +0100 @@ -13,6 +13,14 @@ app_settings_name = Column("app_settings_name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) app_settings_value = Column("app_settings_value", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) + def __init__(self, k, v): + self.app_settings_name = k + self.app_settings_value = v + + def __repr__(self): + return "<RhodeCodeSetting('%s:%s')>" % (self.app_settings_name, + self.app_settings_value) + class RhodeCodeUi(Base): __tablename__ = 'rhodecode_ui' __table_args__ = {'useexisting':True} @@ -35,9 +43,10 @@ lastname = Column("lastname", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) email = Column("email", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None) last_login = Column("last_login", DATETIME(timezone=False), nullable=True, unique=None, default=None) + is_ldap = Column("is_ldap", BOOLEAN(), nullable=False, unique=None, default=False) - user_log = relation('UserLog') - user_perms = relation('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id") + user_log = relation('UserLog', cascade='all') + user_perms = relation('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all') @LazyProperty def full_contact(self):