IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Orders results of the GetAll remote clusters store method (#27548)

Browse Source
This commit is contained in:
Miguel de la Cruz 2024-07-05 13:53:47 +02:00 committed by GitHub
parent e5a3dd7fea
commit b596430920
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/channels/api4/remote_cluster_test.go
View File

@ -14,8 +14,6 @@ import (
)
func TestGetRemoteClusters(t *testing.T) {
t.Skip("MM-59324")
t.Run("Should not work if the remote cluster service is not enabled", func(t *testing.T) {
th := Setup(t)
defer th.TearDown()

3
server/channels/store/sqlstore/remote_cluster_store.go
View File

@ -172,7 +172,8 @@ func (s sqlRemoteClusterStore) GetAll(offset, limit int, filter model.RemoteClus
query := s.getQueryBuilder().
Select(remoteClusterFields("rc")...).
From("RemoteClusters rc")
From("RemoteClusters rc").
OrderBy("rc.DisplayName, rc.Name")
if filter.InChannel != "" {
query = query.Where("rc.RemoteId IN (SELECT scr.RemoteId FROM SharedChannelRemotes scr WHERE scr.ChannelId = ?)", filter.InChannel)