diff options
author | Chris <ccbrown112@gmail.com> | 2017-10-20 17:34:07 -0700 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-10-20 20:34:07 -0400 |
commit | fd6192473b3c2a91d1520e366d931063e359a67d (patch) | |
tree | ce23b9450d781f5ac594f418e9ce2ed933eb10ea /app | |
parent | d39a722a819b154d260b90905065a000749778b6 (diff) | |
download | chat-fd6192473b3c2a91d1520e366d931063e359a67d.tar.gz chat-fd6192473b3c2a91d1520e366d931063e359a67d.tar.bz2 chat-fd6192473b3c2a91d1520e366d931063e359a67d.zip |
refactor max users per team (#7691)
Diffstat (limited to 'app')
-rw-r--r-- | app/auto_users.go | 2 | ||||
-rw-r--r-- | app/team.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/auto_users.go b/app/auto_users.go index 78126211e..ee2df5152 100644 --- a/app/auto_users.go +++ b/app/auto_users.go @@ -52,7 +52,7 @@ func (a *App) CreateBasicUser(client *model.Client) *model.AppError { } ruser := result.Data.(*model.User) store.Must(a.Srv.Store.User().VerifyEmail(ruser.Id)) - store.Must(a.Srv.Store.Team().SaveMember(&model.TeamMember{TeamId: basicteam.Id, UserId: ruser.Id})) + store.Must(a.Srv.Store.Team().SaveMember(&model.TeamMember{TeamId: basicteam.Id, UserId: ruser.Id}, *a.Config().TeamSettings.MaxUsersPerTeam)) } return nil } diff --git a/app/team.go b/app/team.go index 61d0f52b6..db3d9bb7a 100644 --- a/app/team.go +++ b/app/team.go @@ -304,7 +304,7 @@ func (a *App) joinUserToTeam(team *model.Team, user *model.User) (*model.TeamMem } } else { // Membership appears to be missing. Lets try to add. - if tmr := <-a.Srv.Store.Team().SaveMember(tm); tmr.Err != nil { + if tmr := <-a.Srv.Store.Team().SaveMember(tm, *a.Config().TeamSettings.MaxUsersPerTeam); tmr.Err != nil { return nil, false, tmr.Err } else { return tmr.Data.(*model.TeamMember), false, nil |