vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'orgs' of https://bitbucket.org/yackob03/quay into orgs

Browse source
This commit is contained in:
Joseph Schorr 2013-11-04 16:44:35 -05:00
commit 17a07ea6e0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
auth/permissions.py
View file

@ -120,8 +120,9 @@ class ViewTeamPermission(Permission):
team_admin = _TeamNeed(org_name, team_name, 'admin') team_admin = _TeamNeed(org_name, team_name, 'admin')
team_creator = _TeamNeed(org_name, team_name, 'creator') team_creator = _TeamNeed(org_name, team_name, 'creator')
team_member = _TeamNeed(org_name, team_name, 'member') team_member = _TeamNeed(org_name, team_name, 'member')
admin_org = _OrganizationNeed(org_name, 'admin')
super(ViewTeamPermission, self).__init__(team_admin, team_creator, super(ViewTeamPermission, self).__init__(team_admin, team_creator,
team_member) team_member, admin_org)
@identity_loaded.connect_via(app) @identity_loaded.connect_via(app)

1
endpoints/web.py
View file

@ -168,7 +168,6 @@ def github_oauth_callback():
if common_login(to_login): if common_login(to_login):
return redirect(url_for('index')) return redirect(url_for('index'))
# TODO something bad happened, we need to tell the user somehow
return render_template('githuberror.html') return render_template('githuberror.html')