diff --git a/atst/domain/auth.py b/atst/domain/auth.py index ee3ff973..c1a25c95 100644 --- a/atst/domain/auth.py +++ b/atst/domain/auth.py @@ -3,7 +3,7 @@ from flask import g, redirect, url_for, session, request from atst.domain.users import Users -UNPROTECTED_ROUTES = ["atst.root", "atst.login_dev", "atst.login_redirect", "atst.unauthorized", "static"] +UNPROTECTED_ROUTES = ["atst.root", "dev.login_dev", "atst.login_redirect", "atst.unauthorized", "static"] def apply_authentication(app): @app.before_request diff --git a/atst/routes/requests/index.py b/atst/routes/requests/index.py index 0de74bd2..79090d67 100644 --- a/atst/routes/requests/index.py +++ b/atst/routes/requests/index.py @@ -24,11 +24,11 @@ def requests_index(): requests = [] if ( "review_and_approve_jedi_workspace_request" - in g.current_user["atat_permissions"] + in g.current_user.atat_permissions ): requests = Requests.get_many() else: - requests = Requests.get_many(creator_id=g.current_user["id"]) + requests = Requests.get_many(creator_id=g.current_user.id) mapped_requests = [map_request(g.current_user, r) for r in requests] diff --git a/templates/navigation/global_navigation.html b/templates/navigation/global_navigation.html index 79728185..6255e604 100644 --- a/templates/navigation/global_navigation.html +++ b/templates/navigation/global_navigation.html @@ -18,7 +18,7 @@ icon="document", active=g.matchesPath('/requests'), subnav=[ - {"label":"New Request", "href":"/requests/new", "icon": "plus", "active": g.matchesPath('/requests/new')}, + {"label":"New Request", "href":"/requests/new/1", "icon": "plus", "active": g.matchesPath('/requests/new')}, ] ) }} {{ SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=g.matchesPath('/workspaces')) }}