hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-11 12:03:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

add 'pending' to user REST model

Browse Source
This commit is contained in:
Min RK
2015-02-06 14:46:50 -08:00
parent b5eda9d785
commit c82903b85e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jupyterhub/apihandlers/users.py
View File

@@ -14,12 +14,18 @@ from .base import APIHandler
class BaseUserHandler(APIHandler): class BaseUserHandler(APIHandler):
def user_model(self, user): def user_model(self, user):
return { model = {
'name': user.name, 'name': user.name,
'admin': user.admin, 'admin': user.admin,
'server': user.server.base_url if user.running and not (user.spawn_pending or user.stop_pending) else None, 'server': user.server.base_url if user.running else None,
'pending': None,
'last_activity': user.last_activity.isoformat(), 'last_activity': user.last_activity.isoformat(),
} }
if user.spawn_pending:
model['pending'] = 'spawn'
elif user.stop_pending:
model['pending'] = 'stop'
return model
_model_types = { _model_types = {
'name': str, 'name': str,

2
jupyterhub/tests/test_api.py
View File

@@ -104,11 +104,13 @@ def test_get_users(app):
'name': 'admin', 'name': 'admin',
'admin': True, 'admin': True,
'server': None, 'server': None,
'pending': None,
}, },
{ {
'name': 'user', 'name': 'user',
'admin': False, 'admin': False,
'server': None, 'server': None,
'pending': None,
} }
] ]