IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(invite): fixes for org invite enhancement story, #2353

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-08-17 10:55:52 +02:00
parent f7ea420a3f
commit 4a6b5274bc
7 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/org_invite.go
View File

@@ -181,7 +181,9 @@ func CompleteInvite(c *middleware.Context, completeInvite dtos.CompleteInviteFor
// add to org
addOrgUserCmd := m.AddOrgUserCommand{OrgId: invite.OrgId, UserId: user.Id, Role: invite.Role}
if err := bus.Dispatch(&addOrgUserCmd); err != nil {
return ApiError(500, "Error while trying to create org user", err)
if err != m.ErrOrgUserAlreadyAdded {
return ApiError(500, "Error while trying to create org user", err)
}
}
// set org to active