Mercurial > kallithea

diff rhodecode/model/db.py @ 2510:9059b2d91303 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- 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,