IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 10:03:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Changed name of dashboard service to dashboardSrv

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-08-08 13:45:42 +02:00
parent abc8077a96
commit 7b011c1d96
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/controllers/dash.js
View File

@ -11,7 +11,7 @@ function (angular, $, config, _) {
var module = angular.module('grafana.controllers');
module.controller('DashCtrl', function(
$scope, $rootScope, dashboardKeybindings, filterSrv, dashboard, panelMoveSrv, timer) {
$scope, $rootScope, dashboardKeybindings, filterSrv, dashboardSrv, panelMoveSrv, timer) {
$scope.editor = { index: 0 };
$scope.panelNames = config.panels;
@ -26,7 +26,7 @@ function (angular, $, config, _) {
$rootScope.fullscreen = false;
$scope.dashboard = dashboard.create(dashboardData);
$scope.dashboard = dashboardSrv.create(dashboardData);
$scope.grafana.style = $scope.dashboard.style;
$scope.filter = filterSrv;

2
src/app/services/all.js
View File

@ -10,6 +10,6 @@ define([
'./playlistSrv',
'./unsavedChangesSrv',
'./dashboard/dashboardKeyBindings',
'./dashboard/dashboardModel',
'./dashboard/dashboardSrv',
],
function () {});

2
src/app/services/dashboard/dashboardModel.js → src/app/services/dashboard/dashboardSrv.js
View File

@ -10,7 +10,7 @@ function (angular, $, kbn, _) {
var module = angular.module('grafana.services');
module.service('dashboard', function(timer, $rootScope, $timeout) {
module.service('dashboardSrv', function(timer, $rootScope, $timeout) {
function DashboardModel (data) {

10
src/test/specs/dashboardModel-specs.js → src/test/specs/dashboardSrv-specs.js
View File

@ -1,5 +1,5 @@
define([
'services/dashboard/dashboardModel'
'services/dashboard/dashboardSrv'
], function() {
'use strict';
@ -8,8 +8,8 @@ define([
beforeEach(module('grafana.services'));
beforeEach(inject(function(dashboard) {
model = dashboard.create({});
beforeEach(inject(function(dashboardSrv) {
model = dashboardSrv.create({});
}));
it('should have title', function() {
@ -30,8 +30,8 @@ define([
beforeEach(module('grafana.services'));
beforeEach(inject(function(dashboard) {
model = dashboard.create({
beforeEach(inject(function(dashboardSrv) {
model = dashboardSrv.create({
services: { filter: { time: { from: 'now-1d', to: 'now'}, list: [1] }},
rows: [
{

2
src/test/test-main.js
View File

@ -121,7 +121,7 @@ require([
'specs/graph-ctrl-specs',
'specs/filterSrv-specs',
'specs/kbn-format-specs',
'specs/dashboardModel-specs',
'specs/dashboardSrv-specs',
'specs/influxSeries-specs'
], function () {
window.__karma__.start();