From d14a292896c12177d645a7e1f628c75ac0890eb8 Mon Sep 17 00:00:00 2001 From: yackob03 Date: Mon, 4 Nov 2013 16:44:38 -0500 Subject: [PATCH 1/2] Org admins should be able to view all teams. --- auth/permissions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/auth/permissions.py b/auth/permissions.py index c90c75e04..c0b98f874 100644 --- a/auth/permissions.py +++ b/auth/permissions.py @@ -120,8 +120,9 @@ class ViewTeamPermission(Permission): team_admin = _TeamNeed(org_name, team_name, 'admin') team_creator = _TeamNeed(org_name, team_name, 'creator') team_member = _TeamNeed(org_name, team_name, 'member') + admin_org = _OrganizationNeed(org_name, 'admin') super(ViewTeamPermission, self).__init__(team_admin, team_creator, - team_member) + team_member, admin_org) @identity_loaded.connect_via(app) From 7991c3eff88082f04327e1cf06fdb65c7d9b0b06 Mon Sep 17 00:00:00 2001 From: yackob03 Date: Mon, 4 Nov 2013 16:44:51 -0500 Subject: [PATCH 2/2] Remove an old todo since we are actually handling the case. --- endpoints/web.py | 1 - 1 file changed, 1 deletion(-) diff --git a/endpoints/web.py b/endpoints/web.py index c1c59674a..6596a52ba 100644 --- a/endpoints/web.py +++ b/endpoints/web.py @@ -168,7 +168,6 @@ def github_oauth_callback(): if common_login(to_login): return redirect(url_for('index')) - # TODO something bad happened, we need to tell the user somehow return render_template('githuberror.html')