Mercurial > kallithea
comparison rhodecode/model/db.py @ 2510:9059b2d91303 beta
Change return paremeters for get_api_data in user and repo
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 26 Jun 2012 03:40:24 +0200 |
| parents | 43cb5b6047fd |
| children | a1e156503afe |
comparison
equal
deleted
inserted
replaced
| 2509:955956f4bdda | 2510:9059b2d91303 |
|---|---|
| 431 """ | 431 """ |
| 432 Common function for generating user related data for API | 432 Common function for generating user related data for API |
| 433 """ | 433 """ |
| 434 user = self | 434 user = self |
| 435 data = dict( | 435 data = dict( |
| 436 id=user.user_id, | 436 user_id=user.user_id, |
| 437 username=user.username, | 437 username=user.username, |
| 438 api_key=user.api_key, | |
| 439 firstname=user.name, | 438 firstname=user.name, |
| 440 lastname=user.lastname, | 439 lastname=user.lastname, |
| 441 email=user.email, | 440 email=user.email, |
| 442 emails=user.emails, | 441 emails=user.emails, |
| 442 api_key=user.api_key, | |
| 443 active=user.active, | 443 active=user.active, |
| 444 admin=user.admin, | 444 admin=user.admin, |
| 445 ldap_dn=user.ldap_dn, | 445 ldap_dn=user.ldap_dn, |
| 446 last_login=user.last_login, | 446 last_login=user.last_login, |
| 447 ) | 447 ) |
| 759 Common function for generating repo api data | 759 Common function for generating repo api data |
| 760 | 760 |
| 761 """ | 761 """ |
| 762 repo = self | 762 repo = self |
| 763 data = dict( | 763 data = dict( |
| 764 id=repo.repo_id, | 764 repo_id=repo.repo_id, |
| 765 repo_name=repo.repo_name, | 765 repo_name=repo.repo_name, |
| 766 repo_type=repo.repo_type, | 766 repo_type=repo.repo_type, |
| 767 clone_uri=repo.clone_uri, | 767 clone_uri=repo.clone_uri, |
| 768 private=repo.private, | 768 private=repo.private, |
| 769 created_on=repo.created_on, | 769 created_on=repo.created_on, |