From 776f15055a1bd866b91cac3add9e1fd88a2f1b33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Thu, 2 Apr 2015 09:50:57 +0200
Subject: [PATCH] Fixed grafana version in dash settings footer, Fixes #1699

---
 latest.json                                  | 3 +--
 public/app/directives/grafanaVersionCheck.js | 6 +++---
 public/app/services/contextSrv.js            | 7 ++++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/latest.json b/latest.json
index 1ca0904fd94..caa14a3342e 100644
--- a/latest.json
+++ b/latest.json
@@ -1,4 +1,3 @@
 {
-	"version": "1.9.1",
-	"url": "https://grafanarel.s3.amazonaws.com/grafana-1.9.1.tar.gz"
+	"version": "2.0.0-beta1",
 }
diff --git a/public/app/directives/grafanaVersionCheck.js b/public/app/directives/grafanaVersionCheck.js
index 487265e26af..c98ce269381 100644
--- a/public/app/directives/grafanaVersionCheck.js
+++ b/public/app/directives/grafanaVersionCheck.js
@@ -6,11 +6,11 @@ function (angular) {
 
   angular
     .module('grafana.directives')
-    .directive('grafanaVersionCheck', function($http, grafanaVersion) {
+    .directive('grafanaVersionCheck', function($http, contextSrv) {
       return {
         restrict: 'A',
         link: function(scope, elem) {
-          if (grafanaVersion[0] === '@') {
+          if (contextSrv.version === 'master') {
             return;
           }
 
@@ -20,7 +20,7 @@ function (angular) {
                 return;
               }
 
-              if (grafanaVersion !== response.data.version) {
+              if (contextSrv.version !== response.data.version) {
                 elem.append('<i class="icon-info-sign"></i> ' +
                             '<a href="http://grafana.org/download" target="_blank"> ' +
                                 'New version available: ' + response.data.version +
diff --git a/public/app/services/contextSrv.js b/public/app/services/contextSrv.js
index 24373fff6eb..c615e0baf8c 100644
--- a/public/app/services/contextSrv.js
+++ b/public/app/services/contextSrv.js
@@ -2,13 +2,14 @@ define([
   'angular',
   'lodash',
   'store',
+  'config',
 ],
-function (angular, _, store) {
+function (angular, _, store, config) {
   'use strict';
 
   var module = angular.module('grafana.services');
 
-  module.service('contextSrv', function(grafanaVersion, $rootScope, $timeout) {
+  module.service('contextSrv', function($rootScope, $timeout) {
     var self = this;
 
     function User() {
@@ -17,7 +18,7 @@ function (angular, _, store) {
       }
     }
 
-    this.version = grafanaVersion;
+    this.version = config.buildInfo.version;
     this.lightTheme = false;
     this.user = new User();
     this.isSignedIn = this.user.isSignedIn;