pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some additional login handling bugs

Browse Source
This commit is contained in:
dandds 2018-08-06 14:39:10 -04:00
parent 6c4e27655d
commit 2fd34194b3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/domain/auth.py
View File

@ -3,7 +3,7 @@ from flask import g, redirect, url_for, session, request
from atst.domain.users import Users 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): def apply_authentication(app):
@app.before_request @app.before_request

4
atst/routes/requests/index.py
View File

@ -24,11 +24,11 @@ def requests_index():
requests = [] requests = []
if ( if (
"review_and_approve_jedi_workspace_request" "review_and_approve_jedi_workspace_request"
in g.current_user["atat_permissions"] in g.current_user.atat_permissions
): ):
requests = Requests.get_many() requests = Requests.get_many()
else: 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] mapped_requests = [map_request(g.current_user, r) for r in requests]

2
templates/navigation/global_navigation.html
View File

@ -18,7 +18,7 @@
icon="document", icon="document",
active=g.matchesPath('/requests'), active=g.matchesPath('/requests'),
subnav=[ 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')) }} {{ SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=g.matchesPath('/workspaces')) }}