diff options
| author | cpanato <ctadeu@gmail.com> | 2018-06-15 17:38:08 +0200 |
|---|---|---|
| committer | cpanato <ctadeu@gmail.com> | 2018-06-15 17:38:08 +0200 |
| commit | e38b18565ecd9dbe46b0ba8a263c7a39caa0bfda (patch) | |
| tree | 3df8e817eafd710bbc3b5ef04ea42c3d2581c74f /store | |
| parent | c8b99b97dffbc7c96b3911f6301f0ec69399cea2 (diff) | |
| parent | 85a75526c7c03fca1d14a39cfb3f2638d98d3fe1 (diff) | |
| download | chat-e38b18565ecd9dbe46b0ba8a263c7a39caa0bfda.tar.gz chat-e38b18565ecd9dbe46b0ba8a263c7a39caa0bfda.tar.bz2 chat-e38b18565ecd9dbe46b0ba8a263c7a39caa0bfda.zip | |
Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to-master-20180615
Diffstat (limited to 'store')
| -rw-r--r-- | store/sqlstore/team_store.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/store/sqlstore/team_store.go b/store/sqlstore/team_store.go index 22f0bdb29..95b73e542 100644 --- a/store/sqlstore/team_store.go +++ b/store/sqlstore/team_store.go @@ -342,7 +342,7 @@ func (s SqlTeamStore) GetAll() store.StoreChannel { func (s SqlTeamStore) GetAllPage(offset int, limit int) store.StoreChannel { return store.Do(func(result *store.StoreResult) { var data []*model.Team - if _, err := s.GetReplica().Select(&data, "SELECT * FROM Teams LIMIT :Limit OFFSET :Offset", map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil { + if _, err := s.GetReplica().Select(&data, "SELECT * FROM Teams ORDER BY DisplayName LIMIT :Limit OFFSET :Offset", map[string]interface{}{"Offset": offset, "Limit": limit}); err != nil { result.Err = model.NewAppError("SqlTeamStore.GetAllTeams", "store.sql_team.get_all.app_error", nil, err.Error(), http.StatusInternalServerError) } |