diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-09-30 15:38:15 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-09-30 15:38:15 -0400 |
| commit | 2d3ddfd467036935bc983cd77b4ab1243ac58cb6 (patch) | |
| tree | ed74e719e3d14857808a2dae5c5a08ebc35ed18d /api/team.go | |
| parent | 46f86e7076a1dec6717a959299a08289a5cc54ac (diff) | |
| parent | ad92a90b02fdcea3846376747cedf8c81e5a2d22 (diff) | |
| download | chat-2d3ddfd467036935bc983cd77b4ab1243ac58cb6.tar.gz chat-2d3ddfd467036935bc983cd77b4ab1243ac58cb6.tar.bz2 chat-2d3ddfd467036935bc983cd77b4ab1243ac58cb6.zip | |
Merge release branch 'release-1.0.0'
Diffstat (limited to 'api/team.go')
| -rw-r--r-- | api/team.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/api/team.go b/api/team.go index fba4b41c6..8e5d634aa 100644 --- a/api/team.go +++ b/api/team.go @@ -509,7 +509,7 @@ func InviteMembers(c *Context, team *model.Team, user *model.User, invites []str sender := user.GetDisplayName() senderRole := "" - if model.IsInRole(user.Roles, model.ROLE_TEAM_ADMIN) || model.IsInRole(user.Roles, model.ROLE_SYSTEM_ADMIN) { + if c.IsTeamAdmin() { senderRole = "administrator" } else { senderRole = "member" @@ -569,7 +569,7 @@ func updateTeamDisplayName(c *Context, w http.ResponseWriter, r *http.Request) { return } - if !model.IsInRole(c.Session.Roles, model.ROLE_TEAM_ADMIN) { + if !c.IsTeamAdmin() { c.Err = model.NewAppError("updateTeamDisplayName", "You do not have the appropriate permissions", "userId="+c.Session.UserId) c.Err.StatusCode = http.StatusForbidden return @@ -603,7 +603,7 @@ func getMyTeam(c *Context, w http.ResponseWriter, r *http.Request) { } func importTeam(c *Context, w http.ResponseWriter, r *http.Request) { - if !c.HasPermissionsToTeam(c.Session.TeamId, "import") || !c.IsTeamAdmin(c.Session.UserId) { + if !c.HasPermissionsToTeam(c.Session.TeamId, "import") || !c.IsTeamAdmin() { c.Err = model.NewAppError("importTeam", "Only a team admin can import data.", "userId="+c.Session.UserId) c.Err.StatusCode = http.StatusForbidden return @@ -670,7 +670,7 @@ func importTeam(c *Context, w http.ResponseWriter, r *http.Request) { } func exportTeam(c *Context, w http.ResponseWriter, r *http.Request) { - if !c.HasPermissionsToTeam(c.Session.TeamId, "export") || !c.IsTeamAdmin(c.Session.UserId) { + if !c.HasPermissionsToTeam(c.Session.TeamId, "export") || !c.IsTeamAdmin() { c.Err = model.NewAppError("exportTeam", "Only a team admin can export data.", "userId="+c.Session.UserId) c.Err.StatusCode = http.StatusForbidden return |