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

don't omit server model if it's empty

Browse Source 
if request has access to read servers, leave it present and empty

only omit it if there's no access to read server models
This commit is contained in:
Min RK
2021-08-03 20:43:38 +02:00
parent 71e9767307
commit 468738a3df
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
jupyterhub/apihandlers/base.py
View File

@@ -243,7 +243,10 @@ class APIHandler(BaseHandler):
# (this includes pending events) # (this includes pending events)
if spawner.active and scope_filter(spawner, kind='server'): if spawner.active and scope_filter(spawner, kind='server'):
servers[name] = self.server_model(spawner) servers[name] = self.server_model(spawner)
if not servers: if not servers and 'servers' not in allowed_keys:
# omit servers if no access
# leave present and empty
# if request has access to read servers in general
model.pop('servers') model.pop('servers')
return model return model

3
jupyterhub/tests/test_api.py
View File

@@ -154,11 +154,10 @@ def fill_user(model):
model.setdefault('roles', []) model.setdefault('roles', [])
model.setdefault('groups', []) model.setdefault('groups', [])
model.setdefault('admin', False) model.setdefault('admin', False)
model.setdefault('server', None)
model.setdefault('pending', None) model.setdefault('pending', None)
model.setdefault('created', TIMESTAMP) model.setdefault('created', TIMESTAMP)
model.setdefault('last_activity', TIMESTAMP) model.setdefault('last_activity', TIMESTAMP)
# model.setdefault('servers', {}) model.setdefault('servers', {})
return model return model