| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 |
- commit aa47eeffb2da4cdc8be8f5b1bb5233eeabcd5a03
- Author: Torkel Ödegaard <torkel.odegaard@gmail.com>
- Date: Thu Sep 18 10:16:25 2014 +0200
- added default default support
- diff --git a/src/app/routes/p_dashboard.js b/src/app/routes/p_dashboard.js
- index 8c4b8d438..de289de7e 100644
- --- a/src/app/routes/p_dashboard.js
- +++ b/src/app/routes/p_dashboard.js
- @@ -1,7 +1,8 @@
- define([
- 'angular',
- + 'store',
- ],
- -function (angular) {
- +function (angular, store) {
- "use strict";
-
- var module = angular.module('grafana.routes');
- @@ -25,12 +26,29 @@ function (angular) {
- });
- });
-
- - module.controller('DashFromDBProvider', function($scope, $rootScope, datasourceSrv, $routeParams, alertSrv) {
- + module.controller('DashFromDBProvider', function(
- + $scope, $rootScope, datasourceSrv, $routeParams,
- + alertSrv, $http, $location) {
-
- var db = datasourceSrv.getGrafanaDB();
- var isTemp = window.location.href.indexOf('dashboard/temp') !== -1;
- +
- if (!$routeParams.id) {
- - $routeParams.id = 'default';
- + var savedRoute = store.get('grafanaDashboardDefault');
- +
- + if (!savedRoute) {
- + $http.get("app/dashboards/default.json?" + new Date().getTime()).then(function(result) {
- + var dashboard = angular.fromJson(result.data);
- + $scope.emitAppEvent('setup-dashboard', dashboard);
- + },function() {
- + alertSrv.set('Error',"Could not load default dashboard", 'error');
- + });
- + return;
- + }
- + else {
- + $location.path(savedRoute);
- + return;
- + }
- }
-
- db.getDashboard($routeParams.id, isTemp)
|