From c283f0996da154b3a6f255d5d5283ac40745ee89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 28 Feb 2015 11:07:22 +0100
Subject: [PATCH] Fixed solo panel view (used for png rendering)

---
 src/app/features/panel/soloPanelCtrl.js | 11 ++++-------
 src/app/routes/backend/all.js           |  6 +++---
 src/app/routes/backend/dashboard.js     |  4 ++--
 src/app/services/backendSrv.js          |  4 ++++
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/app/features/panel/soloPanelCtrl.js b/src/app/features/panel/soloPanelCtrl.js
index 7b101b54de8..c7693e8f58a 100644
--- a/src/app/features/panel/soloPanelCtrl.js
+++ b/src/app/features/panel/soloPanelCtrl.js
@@ -7,15 +7,14 @@ function (angular, $) {
 
   var module = angular.module('grafana.routes');
 
-  module.controller('SoloPanelCtrl', function($scope, $rootScope, datasourceSrv, $routeParams, dashboardSrv, timeSrv, $location) {
+  module.controller('SoloPanelCtrl', function($scope, backendSrv, $routeParams, dashboardSrv, timeSrv, $location, templateValuesSrv) {
     var panelId;
 
     $scope.init = function() {
-      var db = datasourceSrv.getGrafanaDB();
       var params = $location.search();
       panelId = parseInt(params.panelId);
 
-      db.getDashboard($routeParams.id, false)
+      backendSrv.getDashboard($routeParams.slug)
         .then(function(dashboard) {
           $scope.initPanelScope(dashboard);
         }).then(null, function(error) {
@@ -41,12 +40,10 @@ function (angular, $) {
       }
 
       $scope.panel.span = 12;
-      $scope.dashboardViewState = {
-        registerPanel: function() {
-        }
-      };
+      $scope.dashboardViewState = { registerPanel: function() { }, state: {}};
 
       timeSrv.init($scope.dashboard);
+      templateValuesSrv.init($scope.dashboard, $scope.dashboardViewState);
     };
 
     $scope.getPanelById = function(id) {
diff --git a/src/app/routes/backend/all.js b/src/app/routes/backend/all.js
index c6063ec789d..df41f705e85 100644
--- a/src/app/routes/backend/all.js
+++ b/src/app/routes/backend/all.js
@@ -15,12 +15,12 @@ define([
         controller : 'DashFromDBProvider',
         reloadOnSearch: false,
       })
-      .when('/dashboard/db/:id', {
+      .when('/dashboard/db/:slug', {
         templateUrl: 'app/partials/dashboard.html',
         controller : 'DashFromDBProvider',
         reloadOnSearch: false,
       })
-      .when('/dashboard/import/:id', {
+      .when('/dashboard/import/:file', {
         templateUrl: 'app/partials/dashboard.html',
         controller : 'DashFromImportCtrl',
         reloadOnSearch: false,
@@ -93,7 +93,7 @@ define([
         templateUrl: 'app/partials/login.html',
         controller : 'LoginCtrl',
       })
-      .when('/dashboard/solo/:id/', {
+      .when('/dashboard/solo/:slug/', {
         templateUrl: 'app/features/panel/partials/soloPanel.html',
         controller : 'SoloPanelCtrl',
       })
diff --git a/src/app/routes/backend/dashboard.js b/src/app/routes/backend/dashboard.js
index 05886b73a53..c14d5e60c79 100644
--- a/src/app/routes/backend/dashboard.js
+++ b/src/app/routes/backend/dashboard.js
@@ -9,7 +9,7 @@ function (angular) {
 
   module.controller('DashFromDBProvider', function($scope, $routeParams, backendSrv) {
 
-    if (!$routeParams.id) {
+    if (!$routeParams.slug) {
       backendSrv.get('/api/dashboards/home').then(function(result) {
         $scope.initDashboard(result, $scope);
       },function() {
@@ -20,7 +20,7 @@ function (angular) {
       return;
     }
 
-    return backendSrv.get('/api/dashboards/db/' + $routeParams.id).then(function(result) {
+    return backendSrv.getDashboard($routeParams.slug).then(function(result) {
       $scope.initDashboard(result, $scope);
     }, function() {
       $scope.initDashboard({
diff --git a/src/app/services/backendSrv.js b/src/app/services/backendSrv.js
index 6d7efd38b9b..48359741f92 100644
--- a/src/app/services/backendSrv.js
+++ b/src/app/services/backendSrv.js
@@ -81,6 +81,10 @@ function (angular, _, config) {
       return this.get('/api/search', query);
     };
 
+    this.getDashboard = function(slug) {
+      return this.get('/api/dashboards/db/' + slug);
+    };
+
     this.saveDashboard = function(dash) {
       return this.post('/api/dashboards/db/', {dashboard: dash});
     };