Merge branch 'ncc1701' of ssh://bitbucket.org/yackob03/quay into ncc1701

This commit is contained in:
jakedt 2014-04-10 15:20:26 -04:00
commit 73f23f155c
15 changed files with 524 additions and 33 deletions

View file

@ -14,7 +14,7 @@ from endpoints.common import common_login
from data import model
from data.billing import get_plan
from auth.permissions import (AdministerOrganizationPermission, CreateRepositoryPermission,
UserAdminPermission, UserReadPermission)
UserAdminPermission, UserReadPermission, SuperUserPermission)
from auth.auth_context import get_authenticated_user
from auth import scopes
from util.gravatar import compute_hash
@ -65,6 +65,11 @@ def user_view(user):
'preferred_namespace': not (user.stripe_id is None),
})
if features.SUPER_USERS:
user_response.update({
'super_user': user and user == get_authenticated_user() and SuperUserPermission().can()
})
return user_response