Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
28bff0c1
Commit
28bff0c1
authored
May 24, 2017
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v4.3.x'
parents
e6d79dfe
b17a1ed5
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
pkg/api/playlist_play.go
+1
-1
pkg/services/sqlstore/playlist.go
+2
-2
No files found.
pkg/api/playlist_play.go
View file @
28bff0c1
...
...
@@ -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
}
pkg/services/sqlstore/playlist.go
View file @
28bff0c1
...
...
@@ -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
:
i
tem
.
Order
,
Order
:
i
ndex
+
1
,
Title
:
item
.
Title
,
})
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment