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

--HG--
branch : beta

1 files changed, 3 insertions, 5 deletions

diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 481dfb52..fd2fc77f 100755
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -446,16 +446,14 @@ class User(Base, BaseModel):
         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):