From 1ec97e5199155cd0f16e11e2fa98c8a3eef5fceb Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 12 Jan 2016 14:36:04 +0100 Subject: [PATCH] feat(playlist): shortens urls --- pkg/api/api.go | 4 ++-- public/app/features/playlist/playlist_edit_ctrl.js | 2 +- public/app/features/playlist/playlist_routes.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/api/api.go b/pkg/api/api.go index 9c06512c6d3..2155978fc81 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -176,8 +176,8 @@ func Register(r *macaron.Macaron) { r.Group("/playlists", func() { r.Get("/", wrap(SearchPlaylists)) r.Get("/:id", ValidateOrgPlaylist, wrap(GetPlaylist)) - r.Get("/:id/playlistitems", ValidateOrgPlaylist, wrap(GetPlaylistItems)) - r.Get("/:id/playlistdashboards", ValidateOrgPlaylist, wrap(GetPlaylistDashboards)) + r.Get("/:id/items", ValidateOrgPlaylist, wrap(GetPlaylistItems)) + r.Get("/:id/dashboards", ValidateOrgPlaylist, wrap(GetPlaylistDashboards)) r.Delete("/:id", reqEditorRole, ValidateOrgPlaylist, wrap(DeletePlaylist)) r.Put("/:id", reqEditorRole, bind(m.UpdatePlaylistQuery{}), ValidateOrgPlaylist, wrap(UpdatePlaylist)) r.Post("/", reqEditorRole, bind(m.CreatePlaylistQuery{}), wrap(CreatePlaylist)) diff --git a/public/app/features/playlist/playlist_edit_ctrl.js b/public/app/features/playlist/playlist_edit_ctrl.js index 74d62c4c8dd..610558cc5fa 100644 --- a/public/app/features/playlist/playlist_edit_ctrl.js +++ b/public/app/features/playlist/playlist_edit_ctrl.js @@ -25,7 +25,7 @@ function (angular, config, _) { $scope.playlist = result; }); - backendSrv.get('/api/playlists/' + playlistId + '/playlistitems') + backendSrv.get('/api/playlists/' + playlistId + '/items') .then(function(result) { $scope.playlistItems = result; }); diff --git a/public/app/features/playlist/playlist_routes.js b/public/app/features/playlist/playlist_routes.js index 24223c88cbc..c7481573357 100644 --- a/public/app/features/playlist/playlist_routes.js +++ b/public/app/features/playlist/playlist_routes.js @@ -31,7 +31,7 @@ function (angular) { return backendSrv.get('/api/playlists/' + playlistId) .then(function(playlist) { - return backendSrv.get('/api/playlists/' + playlistId + '/playlistdashboards') + return backendSrv.get('/api/playlists/' + playlistId + '/dashboards') .then(function(dashboards) { playlistSrv.start(dashboards, playlist.timespan); });