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

style(playlists): use backendsrv direct

Browse Source 
There is no point resolving the playlists in the routes file.
Loading playlists is what the controller is suppose to do
This commit is contained in:
bergquist 2016-01-08 13:33:24 +01:00
parent 8c05067f88
commit 01a910fedc
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/features/playlist/playlist_routes.js
View File

@ -12,12 +12,7 @@ function (angular, config, _) {
$routeProvider
.when('/playlists', {
templateUrl: 'app/features/playlist/partials/playlists.html',
controller : 'PlaylistsCtrl',
resolve: {
playlists: function (backendSrv) {
return backendSrv.get('/api/playlists');
}
}
controller : 'PlaylistsCtrl'
})
.when('/playlists/create', {
templateUrl: 'app/features/playlist/partials/playlist.html',

8
public/app/features/playlist/playlists_ctrl.js
View File

@ -8,13 +8,11 @@ function (angular, _) {
var module = angular.module('grafana.controllers');
module.controller('PlaylistsCtrl', function(
playlists,
$scope,
$location,
backendSrv
) {
$scope.playlists = playlists;
$scope.playlists = backendSrv.get('/api/playlists');
$scope.playlistUrl = function(playlist) {
return '/playlists/play/' + playlist.id;
@ -26,14 +24,14 @@ function (angular, _) {
modalScope.playlist = playlist;
modalScope.removePlaylist = function() {
modalScope.dismiss();
_.remove(playlists, {id: playlist.id});
_.remove($scope.playlists, {id: playlist.id});
backendSrv.delete('/api/playlists/' + playlist.id)
.then(function() {
$scope.appEvent('alert-success', ['Playlist deleted', '']);
}, function() {
$scope.appEvent('alert-error', ['Unable to delete playlist', '']);
playlists.push(playlist);
$scope.playlists.push(playlist);
});
};