aboutsummaryrefslogtreecommitdiff
path: root/rhodecode/model/db.py
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2012-06-26 03:40:24 +0200
committerMarcin Kuzminski <marcin@python-works.com>2012-06-26 03:40:24 +0200
commit76065ea31b489bf73763ca3c7564259d629bb70a (patch)
treec8a36f5f3504415aec4a5fce624953787119bb38 /rhodecode/model/db.py
parent960e311aa2ca629011e96315075aa2a2b0ee8ab9 (diff)
Change return paremeters for get_api_data in user and repo
--HG-- branch : beta
Diffstat (limited to 'rhodecode/model/db.py')
-rwxr-xr-xrhodecode/model/db.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 89b1e743..8f0377c2 100755
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -433,13 +433,13 @@ class User(Base, BaseModel):
"""
user = self
data = dict(
- id=user.user_id,
+ user_id=user.user_id,
username=user.username,
- api_key=user.api_key,
firstname=user.name,
lastname=user.lastname,
email=user.email,
emails=user.emails,
+ api_key=user.api_key,
active=user.active,
admin=user.admin,
ldap_dn=user.ldap_dn,
@@ -761,7 +761,7 @@ class Repository(Base, BaseModel):
"""
repo = self
data = dict(
- id=repo.repo_id,
+ repo_id=repo.repo_id,
repo_name=repo.repo_name,
repo_type=repo.repo_type,
clone_uri=repo.clone_uri,