Mercurial > kallithea

diff rhodecode/model/db.py @ 2544:6ce3387bf0ce beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed name to firstname in forms - added multiple test for edit my account and edit user from admin - fixed issues with update user accounts from admin
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 04 Jul 2012 18:13:25 +0200
parents 4496d3119627
children 78f96d7bb23b
line wrap: on
line diff
--- a/rhodecode/model/db.py	Wed Jul 04 11:42:16 2012 +0200
+++ b/rhodecode/model/db.py	Wed Jul 04 18:13:25 2012 +0200
@@ -446,16 +446,14 @@
         return data
 
     def __json__(self):
-        return dict(
-            user_id=self.user_id,
-            first_name=self.name,
-            last_name=self.lastname,
-            email=self.email,
+        data = dict(
             full_name=self.full_name,
             full_name_or_username=self.full_name_or_username,
             short_contact=self.short_contact,
             full_contact=self.full_contact
         )
+        data.update(self.get_api_data())
+        return data
 
 
 class UserEmailMap(Base, BaseModel):