diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-01-19 09:00:13 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 09:00:13 -0500 |
| commit | d3a285e64d051aa8d5c4c9854597dfbcce107675 (patch) | |
| tree | e16ca3d52b6347a754e506aa8cac7457c62d3639 /store/sql_channel_store.go | |
| parent | 61b7226533568f3261fc233538ce998bb71a5345 (diff) | |
| download | chat-d3a285e64d051aa8d5c4c9854597dfbcce107675.tar.gz chat-d3a285e64d051aa8d5c4c9854597dfbcce107675.tar.bz2 chat-d3a285e64d051aa8d5c4c9854597dfbcce107675.zip | |
Migrate functions to app package (#5106)
* Refactor and move session logic into app package
* Refactor email functions into the app package
* Refactor password update into app package
* Migrate user functions to app package
* Move team functions into app package
* Migrate channel functions into app package
* Pass SiteURL through to app functions
* Update based on feedback
Diffstat (limited to 'store/sql_channel_store.go')
| -rw-r--r-- | store/sql_channel_store.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 66562ae67..6ac69df5a 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -702,7 +702,7 @@ func (s SqlChannelStore) GetMember(channelId string, userId string) StoreChannel result.Err = model.NewLocAppError("SqlChannelStore.GetMember", "store.sql_channel.get_member.app_error", nil, "channel_id="+channelId+"user_id="+userId+","+err.Error()) } } else { - result.Data = member + result.Data = &member } storeChannel <- result @@ -1361,7 +1361,7 @@ func (s SqlChannelStore) GetMembersByIds(channelId string, userIds []string) Sto if _, err := s.GetReplica().Select(&members, "SELECT * FROM ChannelMembers WHERE ChannelId = :ChannelId AND UserId IN ("+idQuery+")", props); err != nil { result.Err = model.NewLocAppError("SqlChannelStore.GetMembersByIds", "store.sql_channel.get_members_by_ids.app_error", nil, "channelId="+channelId+" "+err.Error()) } else { - result.Data = members + result.Data = &members } storeChannel <- result |