IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remember last dashboard

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-01-06 14:15:48 +01:00
parent 49b18e17d7
commit 72974719ac
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/features/grafanaDatasource/partials/query.editor.html
View File

@ -6,7 +6,7 @@
<p> <p>
This is just a test data source that generates random walk series. If this is your only data source This is just a test data source that generates random walk series. If this is your only data source
open the left side menu and goto data sources admin screen and add your data sources. You can change open the left side menu and navigate to the data sources admin screen and add your data sources. You can change
data source using the button to the left of the <strong>Add query</strong> button. data source using the button to the left of the <strong>Add query</strong> button.
</p> </p>
</div> </div>

4
src/app/partials/sidemenu.html
View File

@ -24,10 +24,6 @@
<i class="icon-sitemap"></i> <i class="icon-sitemap"></i>
Data sources Data sources
</a> </a>
<a class="pro-sidemenu-link" href="admin">
<i class="icon-tasks"></i>
Global options
</a>
<a class="pro-sidemenu-link" href="account"> <a class="pro-sidemenu-link" href="account">
<i class="icon-user"></i> <i class="icon-user"></i>
Account settings Account settings

10
src/app/routes/backend/dashboard.js
View File

@ -33,6 +33,9 @@ function (angular, store) {
}); });
}); });
// remember previous dashboard
var prevDashPath = null;
module.controller('DashFromDBProvider', function( module.controller('DashFromDBProvider', function(
$scope, $rootScope, datasourceSrv, $routeParams, $scope, $rootScope, datasourceSrv, $routeParams,
alertSrv, $http, $location) { alertSrv, $http, $location) {
@ -41,8 +44,12 @@ function (angular, store) {
var isTemp = window.location.href.indexOf('dashboard/temp') !== -1; var isTemp = window.location.href.indexOf('dashboard/temp') !== -1;
if (!$routeParams.id) { if (!$routeParams.id) {
var savedRoute = store.get('grafanaDashboardDefault'); // do we have a previous dash
if (prevDashPath) {
$location.path(prevDashPath);
}
var savedRoute = store.get('grafanaDashboardDefault');
if (!savedRoute) { if (!savedRoute) {
$http.get("app/dashboards/default.json?" + new Date().getTime()).then(function(result) { $http.get("app/dashboards/default.json?" + new Date().getTime()).then(function(result) {
var dashboard = angular.fromJson(result.data); var dashboard = angular.fromJson(result.data);
@ -61,6 +68,7 @@ function (angular, store) {
db.getDashboard($routeParams.id, isTemp) db.getDashboard($routeParams.id, isTemp)
.then(function(dashboard) { .then(function(dashboard) {
prevDashPath = $location.path();
$scope.initDashboard(dashboard, $scope); $scope.initDashboard(dashboard, $scope);
}).then(null, function(err) { }).then(null, function(err) {
$scope.appEvent('alert-error', ['Load dashboard failed', err]); $scope.appEvent('alert-error', ['Load dashboard failed', err]);