##// END OF EJS Templates
api: added last-activity into returned data of get_user api....
marcink -
r1558:107da576 default
parent child Browse files
Show More
@@ -74,6 +74,7 b' def get_user(request, apiuser, userid=Op'
74 "ip_addresses": [],
74 "ip_addresses": [],
75 "language": null,
75 "language": null,
76 "last_login": "Timestamp",
76 "last_login": "Timestamp",
77 "last_activity": "Timestamp",
77 "lastname": "surnae",
78 "lastname": "surnae",
78 "permissions": {
79 "permissions": {
79 "global": [
80 "global": [
@@ -920,6 +920,7 b' class User(Base, BaseModel):'
920 'extern_type': user.extern_type,
920 'extern_type': user.extern_type,
921 'extern_name': user.extern_name,
921 'extern_name': user.extern_name,
922 'last_login': user.last_login,
922 'last_login': user.last_login,
923 'last_activity': user.last_activity,
923 'ip_addresses': user.ip_addresses,
924 'ip_addresses': user.ip_addresses,
924 'language': user_data.get('language')
925 'language': user_data.get('language')
925 }
926 }
@@ -185,6 +185,7 b' class TestMyAccountController(TestContro'
185 updated_params.update({'new_password': ''})
185 updated_params.update({'new_password': ''})
186
186
187 params['last_login'] = updated_params['last_login']
187 params['last_login'] = updated_params['last_login']
188 params['last_activity'] = updated_params['last_activity']
188 # my account page cannot set language param yet, only for admins
189 # my account page cannot set language param yet, only for admins
189 # but we get this info from API anyway
190 # but we get this info from API anyway
190 params['language'] = updated_params['language']
191 params['language'] = updated_params['language']
General Comments 0
You need to be logged in to leave comments. Login now