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

Change team invitation acceptance to join all invited teams under the org

Browse source 
Fixes #1989
This commit is contained in:
Joseph Schorr 2016-11-28 18:39:28 -05:00
parent 1c3012a538
commit 402ad25690
3 changed files with 119 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
endpoints/api/team.py
View file

@ -28,7 +28,8 @@ def permission_view(permission):
def try_accept_invite(code, user):
(team, inviter) = model.team.confirm_team_invite(code, user)
model.notification.delete_matching_notifications(user, 'org_team_invite', code=code)
model.notification.delete_matching_notifications(user, 'org_team_invite',
org=team.organization.username)
orgname = team.organization.username
log_action('org_team_member_invite_accepted', orgname, {
@ -208,6 +209,7 @@ class TeamMemberList(ApiResource):
invites = model.team.get_organization_team_member_invites(team.id)
data = {
'name': teamname,
'members': [member_view(m) for m in members] + [invite_view(i) for i in invites],
'can_edit': edit_permission.can()
}