Mercurial > public > src > rhodecode
diff pylons_app/model/user_model.py @ 453: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 | 5cd6616b8673 |
| children | 05f985964a96 d66a7fa7689b |
line wrap: on
line diff
--- a/pylons_app/model/user_model.py Fri Aug 20 18:43:08 2010 +0200 +++ b/pylons_app/model/user_model.py Sat Aug 21 16:34:37 2010 +0200 @@ -37,6 +37,9 @@ def __init__(self): self.sa = Session() + def get_default(self): + return self.sa.query(User).filter(User.username == 'default').scalar() + def get_user(self, id): return self.sa.query(User).get(id) @@ -57,9 +60,8 @@ try: new_user = User() for k, v in form_data.items(): - if k != 'admin' or k != 'active': + if k != 'admin': setattr(new_user, k, v) - setattr(new_user, 'active', True) self.sa.add(new_user) self.sa.commit()