# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-03-23 13:50:20
# Node ID 107da576d8ef7c534c3d919b6730c39486c589a7
# Parent  41eec473c8875407cdb736ee0eb5c0b5416c3cfa

api: added last-activity into returned data of get_user api.

- refs #5256

diff --git a/rhodecode/api/views/user_api.py b/rhodecode/api/views/user_api.py
--- a/rhodecode/api/views/user_api.py
+++ b/rhodecode/api/views/user_api.py
@@ -74,6 +74,7 @@ def get_user(request, apiuser, userid=Op
             "ip_addresses": [],
             "language": null,
             "last_login": "Timestamp",
+            "last_activity": "Timestamp",
             "lastname": "surnae",
             "permissions": {
               "global": [
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -920,6 +920,7 @@ class User(Base, BaseModel):
             'extern_type': user.extern_type,
             'extern_name': user.extern_name,
             'last_login': user.last_login,
+            'last_activity': user.last_activity,
             'ip_addresses': user.ip_addresses,
             'language': user_data.get('language')
         }
diff --git a/rhodecode/tests/functional/test_admin_my_account.py b/rhodecode/tests/functional/test_admin_my_account.py
--- a/rhodecode/tests/functional/test_admin_my_account.py
+++ b/rhodecode/tests/functional/test_admin_my_account.py
@@ -185,6 +185,7 @@ class TestMyAccountController(TestContro
         updated_params.update({'new_password': ''})
 
         params['last_login'] = updated_params['last_login']
+        params['last_activity'] = updated_params['last_activity']
         # my account page cannot set language param yet, only for admins
         # but we get this info from API anyway
         params['language'] = updated_params['language']