feat(playlist): shortens urls

bergquist · bergquist · commit 1ec97e519915 · 2016-01-12T14:36:04.000+01:00
diff --git 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
@@ -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
@@ -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);
                   });
