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

consolidate progress url

Browse Source 
and include it in server models
This commit is contained in:
Min RK
2018-04-05 11:20:16 +02:00
parent ee1a86d192
commit 6f8a34127b
4 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jupyterhub/handlers/base.py
View File

@@ -887,13 +887,6 @@ class UserSpawnHandler(BaseHandler):
pass
# we may have waited above, check pending again:
url_parts = [self.hub.base_url, 'api/users', user.escaped_name]
if spawner.name:
url_parts.extend(['servers', spawner.name, 'progress'])
else:
url_parts.extend(['server/progress'])
progress_url = url_path_join(*url_parts)
if spawner.pending:
self.log.info("%s is pending %s", spawner._log_name, spawner.pending)
# spawn has started, but not finished
@@ -902,7 +895,7 @@ class UserSpawnHandler(BaseHandler):
html = self.render_template(
"spawn_pending.html",
user=user,
progress_url=progress_url,
progress_url=spawner._progress_url,
)
self.finish(html)
return
@@ -934,7 +927,7 @@ class UserSpawnHandler(BaseHandler):
html = self.render_template(
"spawn_pending.html",
user=user,
progress_url=progress_url,
progress_url=spawner._progress_url,
)
self.finish(html)
return