diff --git a/src/app/p_app.js b/src/app/p_app.js index 55cec05dc41..3dfed6a079b 100644 --- a/src/app/p_app.js +++ b/src/app/p_app.js @@ -61,7 +61,7 @@ function (angular, $, _, appLevelRequire, config) { var apps_deps = [ 'ngRoute', '$strap.directives', - 'ngDragDrop', + 'ang-drag-drop', 'grafana', 'pasvaz.bindonce' ]; diff --git a/src/app/routes/p_login.js b/src/app/routes/p_login.js index 6a9512262a2..2440e70e7b9 100644 --- a/src/app/routes/p_login.js +++ b/src/app/routes/p_login.js @@ -32,7 +32,7 @@ function (angular) { return; } - $http.post('/api/register/user', $scope.loginModel).then(function() { + $http.post('/api/account', $scope.loginModel).then(function() { $location.path('/login'); }, function(err) { $scope.registerError = "Unexpected error: " + err; diff --git a/src/app/services/grafana/grafanaDatasource.js b/src/app/services/grafana/grafanaDatasource.js index 13bfafa8add..8a52dc2c083 100644 --- a/src/app/services/grafana/grafanaDatasource.js +++ b/src/app/services/grafana/grafanaDatasource.js @@ -1,12 +1,8 @@ define([ 'angular', 'lodash', - 'jquery', - 'config', - 'kbn', - 'moment' ], -function (angular) { +function (angular, _) { 'use strict'; var module = angular.module('grafana.services'); @@ -68,7 +64,10 @@ function (angular) { return $http.get('/api/search/', { params: { q: query } }) .then(function(results) { var hits = { dashboards: [], tags: [] }; - hits.dashboards = results.data; + hits.dashboards = _.map(results.data, function(item) { + item.id = item.slug; + return item; + }); return hits; }, function(data) { throw "Failed to search: " + data;