# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1340674824 -7200
# Node ID 9059b2d91303288973a1bcaa14160a09b33658fb
# Parent  955956f4bdda79ab553c6bccf230bee17ae82f4d
Change return paremeters for get_api_data in user and repo

diff -r 955956f4bdda -r 9059b2d91303 rhodecode/model/db.py
--- a/rhodecode/model/db.py	Tue Jun 26 03:39:34 2012 +0200
+++ b/rhodecode/model/db.py	Tue Jun 26 03:40:24 2012 +0200
@@ -433,13 +433,13 @@
         """
         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 @@
         """
         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,