diff options
| author | Corey Hulen <corey@hulen.com> | 2016-07-06 13:40:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 13:40:59 -0800 |
| commit | d5f243dad694d6746ec2b6560a81212a78d8c975 (patch) | |
| tree | 7f1de697c906ff909f26b739eebaa77f18edf790 /store | |
| parent | 3eee51f74e893f3182519ad0edb72dd5d8b107fd (diff) | |
| download | chat-d5f243dad694d6746ec2b6560a81212a78d8c975.tar.gz chat-d5f243dad694d6746ec2b6560a81212a78d8c975.tar.bz2 chat-d5f243dad694d6746ec2b6560a81212a78d8c975.zip | |
PLT-2863 adding remove user from team (#3429)
* PLT-2863 adding remove user from team
* PLT-2863 adding the client side UI
* Fixing trailing space
* Fixing reported issues
* Adding documentatino
* Switching to final javascript driver
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_session_store.go | 24 | ||||
| -rw-r--r-- | store/sql_team_store.go | 1 |
2 files changed, 22 insertions, 3 deletions
diff --git a/store/sql_session_store.go b/store/sql_session_store.go index 525d0e5b2..9ad3a5efa 100644 --- a/store/sql_session_store.go +++ b/store/sql_session_store.go @@ -75,7 +75,13 @@ func (me SqlSessionStore) Save(session *model.Session) StoreChannel { result.Err = model.NewLocAppError("SqlSessionStore.Save", "store.sql_session.save.app_error", nil, "id="+session.Id+", "+rtcs.Err.Error()) return } else { - session.TeamMembers = rtcs.Data.([]*model.TeamMember) + tempMembers := rtcs.Data.([]*model.TeamMember) + session.TeamMembers = make([]*model.TeamMember, 0, len(tempMembers)) + for _, tm := range tempMembers { + if tm.DeleteAt == 0 { + session.TeamMembers = append(session.TeamMembers, tm) + } + } } storeChannel <- result @@ -106,7 +112,13 @@ func (me SqlSessionStore) Get(sessionIdOrToken string) StoreChannel { result.Err = model.NewLocAppError("SqlSessionStore.Get", "store.sql_session.get.app_error", nil, "sessionIdOrToken="+sessionIdOrToken+", "+rtcs.Err.Error()) return } else { - sessions[0].TeamMembers = rtcs.Data.([]*model.TeamMember) + tempMembers := rtcs.Data.([]*model.TeamMember) + sessions[0].TeamMembers = make([]*model.TeamMember, 0, len(tempMembers)) + for _, tm := range tempMembers { + if tm.DeleteAt == 0 { + sessions[0].TeamMembers = append(sessions[0].TeamMembers, tm) + } + } } } @@ -144,7 +156,13 @@ func (me SqlSessionStore) GetSessions(userId string) StoreChannel { return } else { for _, session := range sessions { - session.TeamMembers = rtcs.Data.([]*model.TeamMember) + tempMembers := rtcs.Data.([]*model.TeamMember) + session.TeamMembers = make([]*model.TeamMember, 0, len(tempMembers)) + for _, tm := range tempMembers { + if tm.DeleteAt == 0 { + session.TeamMembers = append(session.TeamMembers, tm) + } + } } } diff --git a/store/sql_team_store.go b/store/sql_team_store.go index c668988dc..ddcaa7896 100644 --- a/store/sql_team_store.go +++ b/store/sql_team_store.go @@ -41,6 +41,7 @@ func NewSqlTeamStore(sqlStore *SqlStore) TeamStore { } func (s SqlTeamStore) UpgradeSchemaIfNeeded() { + s.CreateColumnIfNotExists("TeamMembers", "DeleteAt", "bigint(20)", "bigint", "0") } func (s SqlTeamStore) CreateIndexesIfNotExists() { |