diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-09 10:16:14 -0700 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-10-09 13:16:14 -0400 |
| commit | 0f66b6e72621842467d0e368b95ee58f485d4ace (patch) | |
| tree | 444f9210a151cb735fe0502d4bb47c324592c0e6 /app/user.go | |
| parent | 70e5f00241473c27a3008959ce08832c75e76ba8 (diff) | |
| download | chat-0f66b6e72621842467d0e368b95ee58f485d4ace.tar.gz chat-0f66b6e72621842467d0e368b95ee58f485d4ace.tar.bz2 chat-0f66b6e72621842467d0e368b95ee58f485d4ace.zip | |
store/sqlstore cleanup and postgres tests (#7595)
* sqlstore cleanup / postgres tests
* remove stopped containers
* cmd/platform compile fix
* remove test-postgres target from makefile
Diffstat (limited to 'app/user.go')
| -rw-r--r-- | app/user.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/user.go b/app/user.go index b98583f80..edb4961fc 100644 --- a/app/user.go +++ b/app/user.go @@ -438,7 +438,7 @@ func (a *App) GetUsersPage(page int, perPage int, asAdmin bool) ([]*model.User, } func (a *App) GetUsersEtag() string { - return (<-a.Srv.Store.User().GetEtagForAllProfiles()).Data.(string) + return fmt.Sprintf("%v.%v.%v", (<-a.Srv.Store.User().GetEtagForAllProfiles()).Data.(string), utils.Cfg.PrivacySettings.ShowFullName, utils.Cfg.PrivacySettings.ShowEmailAddress) } func (a *App) GetUsersInTeam(teamId string, offset int, limit int) ([]*model.User, *model.AppError) { @@ -492,11 +492,11 @@ func (a *App) GetUsersNotInTeamPage(teamId string, page int, perPage int, asAdmi } func (a *App) GetUsersInTeamEtag(teamId string) string { - return (<-a.Srv.Store.User().GetEtagForProfiles(teamId)).Data.(string) + return fmt.Sprintf("%v.%v.%v", (<-a.Srv.Store.User().GetEtagForProfiles(teamId)).Data.(string), utils.Cfg.PrivacySettings.ShowFullName, utils.Cfg.PrivacySettings.ShowEmailAddress) } func (a *App) GetUsersNotInTeamEtag(teamId string) string { - return (<-a.Srv.Store.User().GetEtagForProfilesNotInTeam(teamId)).Data.(string) + return fmt.Sprintf("%v.%v.%v", (<-a.Srv.Store.User().GetEtagForProfilesNotInTeam(teamId)).Data.(string), utils.Cfg.PrivacySettings.ShowFullName, utils.Cfg.PrivacySettings.ShowEmailAddress) } func (a *App) GetUsersInChannel(channelId string, offset int, limit int) ([]*model.User, *model.AppError) { |