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

Merge pull request #6479 from utkarshcmu/playlist_bug

Browse Source 
Removed playlist item when dashboard is deleted
This commit is contained in:
Carl Bergquist
2016-11-07 08:00:57 +01:00
committed by GitHub
parent b88791135f c737704eeb
commit d670f1b959
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/api/playlist.go
View File

@@ -26,6 +26,18 @@ func ValidateOrgPlaylist(c *middleware.Context) {
c.JsonApiErr(403, "You are not allowed to edit/view playlist", nil) c.JsonApiErr(403, "You are not allowed to edit/view playlist", nil)
return return
} }
items, itemsErr := LoadPlaylistItemDTOs(id)
if itemsErr != nil {
c.JsonApiErr(404, "Playlist items not found", err)
return
}
if len(items) == 0 {
c.JsonApiErr(404, "Playlist is empty", itemsErr)
return
}
} }
func SearchPlaylists(c *middleware.Context) Response { func SearchPlaylists(c *middleware.Context) Response {

1
pkg/services/sqlstore/dashboard.go
View File

@@ -233,6 +233,7 @@ func DeleteDashboard(cmd *m.DeleteDashboardCommand) error {
"DELETE FROM dashboard_tag WHERE dashboard_id = ? ", "DELETE FROM dashboard_tag WHERE dashboard_id = ? ",
"DELETE FROM star WHERE dashboard_id = ? ", "DELETE FROM star WHERE dashboard_id = ? ",
"DELETE FROM dashboard WHERE id = ?", "DELETE FROM dashboard WHERE id = ?",
"DELETE FROM playlist_item WHERE type = 'dashboard_by_id' AND value = ?",
} }
for _, sql := range deletes { for _, sql := range deletes {