Mercurial > kallithea
comparison rhodecode/model/user.py @ 1586:2ccb32ddcfd7 beta
Add API for repositories and groups (creation, permission)
| author | Nicolas VINOT <aeris@imirhil.fr> |
|---|---|
| date | Sun, 02 Oct 2011 17:39:52 +0200 |
| parents | 5875955def39 |
| children | 10d117545a7e |
comparison
equal
deleted
inserted
replaced
| 1585:56276c716599 | 1586:2ccb32ddcfd7 |
|---|---|
| 46 'repository.write': 3, | 46 'repository.write': 3, |
| 47 'repository.admin': 3} | 47 'repository.admin': 3} |
| 48 | 48 |
| 49 | 49 |
| 50 class UserModel(BaseModel): | 50 class UserModel(BaseModel): |
| 51 | |
| 52 def get(self, user_id, cache=False): | 51 def get(self, user_id, cache=False): |
| 53 user = self.sa.query(User) | 52 user = self.sa.query(User) |
| 54 if cache: | 53 if cache: |
| 55 user = user.options(FromCache("sql_cache_short", | 54 user = user.options(FromCache("sql_cache_short", |
| 56 "get_user_%s" % user_id)) | 55 "get_user_%s" % user_id)) |
| 84 setattr(new_user, k, v) | 83 setattr(new_user, k, v) |
| 85 | 84 |
| 86 new_user.api_key = generate_api_key(form_data['username']) | 85 new_user.api_key = generate_api_key(form_data['username']) |
| 87 self.sa.add(new_user) | 86 self.sa.add(new_user) |
| 88 self.sa.commit() | 87 self.sa.commit() |
| 88 return new_user | |
| 89 except: | 89 except: |
| 90 log.error(traceback.format_exc()) | 90 log.error(traceback.format_exc()) |
| 91 self.sa.rollback() | 91 self.sa.rollback() |
| 92 raise | 92 raise |
| 93 | 93 |