diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-08-17 09:35:36 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-08-17 09:35:36 -0700 |
| commit | fd1301779fecc2910a9fdcf93af52ff33a4349ba (patch) | |
| tree | ccd8b35d347b77c8c6a99db9422b3dbc0ff3bd2d /api4/team.go | |
| parent | d41f1695e99a81808f5dc1fbe7820062947b5291 (diff) | |
| parent | 0033e3e37b12cb5d951d21492500d66a6abc472b (diff) | |
| download | chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.tar.gz chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.tar.bz2 chat-fd1301779fecc2910a9fdcf93af52ff33a4349ba.zip | |
Merge branch 'release-4.1'
Diffstat (limited to 'api4/team.go')
| -rw-r--r-- | api4/team.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api4/team.go b/api4/team.go index 98a672d93..b71b285e6 100644 --- a/api4/team.go +++ b/api4/team.go @@ -85,7 +85,7 @@ func getTeam(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = err return } else { - if team.Type != model.TEAM_OPEN && !app.SessionHasPermissionToTeam(c.Session, team.Id, model.PERMISSION_VIEW_TEAM) { + if (!team.AllowOpenInvite || team.Type != model.TEAM_OPEN) && !app.SessionHasPermissionToTeam(c.Session, team.Id, model.PERMISSION_VIEW_TEAM) { c.SetPermissionError(model.PERMISSION_VIEW_TEAM) return } @@ -105,7 +105,7 @@ func getTeamByName(c *Context, w http.ResponseWriter, r *http.Request) { c.Err = err return } else { - if team.Type != model.TEAM_OPEN && !app.SessionHasPermissionToTeam(c.Session, team.Id, model.PERMISSION_VIEW_TEAM) { + if (!team.AllowOpenInvite || team.Type != model.TEAM_OPEN) && !app.SessionHasPermissionToTeam(c.Session, team.Id, model.PERMISSION_VIEW_TEAM) { c.SetPermissionError(model.PERMISSION_VIEW_TEAM) return } |