Mercurial > kallithea
comparison pylons_app/model/user_model.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 | 5cd6616b8673 |
children | d66a7fa7689b |
comparison
equal
deleted
inserted
replaced
416:25ab66a26975 | 417:3ed2d46a2ca7 |
---|---|
35 class UserModel(object): | 35 class UserModel(object): |
36 | 36 |
37 def __init__(self): | 37 def __init__(self): |
38 self.sa = Session() | 38 self.sa = Session() |
39 | 39 |
40 def get_default(self): | |
41 return self.sa.query(User).filter(User.username == 'default').scalar() | |
42 | |
40 def get_user(self, id): | 43 def get_user(self, id): |
41 return self.sa.query(User).get(id) | 44 return self.sa.query(User).get(id) |
42 | 45 |
43 def create(self, form_data): | 46 def create(self, form_data): |
44 try: | 47 try: |
55 | 58 |
56 def create_registration(self, form_data): | 59 def create_registration(self, form_data): |
57 try: | 60 try: |
58 new_user = User() | 61 new_user = User() |
59 for k, v in form_data.items(): | 62 for k, v in form_data.items(): |
60 if k != 'admin' or k != 'active': | 63 if k != 'admin': |
61 setattr(new_user, k, v) | 64 setattr(new_user, k, v) |
62 setattr(new_user, 'active', True) | |
63 | 65 |
64 self.sa.add(new_user) | 66 self.sa.add(new_user) |
65 self.sa.commit() | 67 self.sa.commit() |
66 except Exception as e: | 68 except Exception as e: |
67 log.error(e) | 69 log.error(e) |