IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-26 02:40:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v4.3.x'

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-05-24 13:22:09 +02:00
commit 28bff0c1f3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/playlist_play.go
View File

@ -91,6 +91,6 @@ func LoadPlaylistDashboards(orgId, userId, playlistId int64) (dtos.PlaylistDashb
result = append(result, k...)
result = append(result, populateDashboardsByTag(orgId, userId, dashboardByTag, dashboardTagOrder)...)
sort.Sort(sort.Reverse(result))
sort.Sort(result)
return result, nil
}

4
pkg/services/sqlstore/playlist.go
View File

@ -83,12 +83,12 @@ func UpdatePlaylist(cmd *m.UpdatePlaylistCommand) error {
playlistItems := make([]m.PlaylistItem, 0)
for _, item := range cmd.Items {
for index, item := range cmd.Items {
playlistItems = append(playlistItems, m.PlaylistItem{
PlaylistId: playlist.Id,
Type: item.Type,
Value: item.Value,
Order: item.Order,
Order: index + 1,
Title: item.Title,
})
}