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

Clean up extra handler defaults

Browse Source
This commit is contained in:
Haw-minn Lu
2018-05-10 11:22:50 -07:00
parent 9cefb27704
commit 5179d922f5
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jupyterhub/app.py
View File

@@ -839,9 +839,7 @@ class JupyterHub(Application):
return handlers return handlers
extra_page_handlers = List().tag(config=True) extra_page_handlers = List().tag(config=True)
default_page = Any(default_value=None).tag(config=True) default_url = Any(default_value=None).tag(config=True)
default_user_page = Any(default_value=None).tag(config=True)
def init_handlers(self): def init_handlers(self):
h = [] h = []

12
jupyterhub/handlers/base.py
View File

@@ -426,20 +426,16 @@ class BaseHandler(RequestHandler):
self.log.warning("Redirecting %s to %s. For sharing public links, use /user-redirect/", self.log.warning("Redirecting %s to %s. For sharing public links, use /user-redirect/",
self.request.uri, next_url, self.request.uri, next_url,
) )
if not next_url and self.config.JupyterHub.get('default_url'):
next_url = url_path_join(self.hub.base_url, self.config.JupyterHub['default_url'])
if not next_url: if not next_url:
# default URL after login # default URL after login
# if self.redirect_to_server, default login URL initiates spawn # if self.redirect_to_server, default login URL initiates spawn
if user and self.redirect_to_server: if user and self.redirect_to_server:
if self.config.JupyterHub.get('default_user_page'): next_url = user.url
next_url = self.config.JupyterHub['default_user_page']
else:
next_url = user.url
else: else:
if self.config.JupyterHub.get('default_page'): next_url = url_path_join(self.hub.base_url, 'home')
next_url = self.config.JupyterHub['default_page']
else:
next_url = url_path_join(self.hub.base_url, 'home')
return next_url return next_url
async def login_user(self, data=None): async def login_user(self, data=None):