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

Fix implementation of default server name

Browse Source
This commit is contained in:
William Krinsman
2019-12-12 00:51:06 +00:00
parent 61a844b413
commit 794be0de8e
2 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
jupyterhub/handlers/base.py
View File

@@ -1526,14 +1526,30 @@ class UserRedirectHandler(BaseHandler):
) )
if url is None: if url is None:
user = self.current_user user = self.current_user
user_url = url_path_join(user.url, path) user_url = user.url
if self.app.default_server_name:
user_url = url_path_join(user_url, self.app.default_server_name)
user_url = url_path_join(user_url, path)
if self.request.query: if self.request.query:
user_url = url_concat(user_url, parse_qsl(self.request.query)) user_url = url_concat(user_url, parse_qsl(self.request.query))
url = url_concat( if self.app.default_server_name:
url_path_join(self.hub.base_url, "spawn", user.escaped_name), url = url_concat(
{"next": user_url}, url_path_join(
) self.hub.base_url,
"spawn",
user.escaped_name,
self.app.default_server_name,
),
{"next": user_url},
)
else:
url = url_concat(
url_path_join(self.hub.base_url, "spawn", user.escaped_name),
{"next": user_url},
)
self.redirect(url) self.redirect(url)

9
jupyterhub/user.py
View File

@@ -389,14 +389,9 @@ class User:
Full name.domain/path if using subdomains, otherwise just my /base/url Full name.domain/path if using subdomains, otherwise just my /base/url
""" """
if self.settings.get('subdomain_host'): if self.settings.get('subdomain_host'):
url = '{host}{path}'.format(host=self.host, path=self.base_url) return '{host}{path}'.format(host=self.host, path=self.base_url)
else: else:
url = self.base_url return self.base_url
if self.settings.get('default_server_name'):
return url_path_join(url, self.settings.get('default_server_name'))
else:
return url
def server_url(self, server_name=''): def server_url(self, server_name=''):
"""Get the url for a server with a given name""" """Get the url for a server with a given name"""