IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 01:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Home dashboard per user per org works

Browse Source
This commit is contained in:
utkarshcmu 2016-03-17 01:38:18 -07:00
parent 66621d762e
commit 4fbe954a79
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/api.go
View File

@ -162,7 +162,7 @@ func Register(r *macaron.Macaron) {
// Preferences
r.Group("/preferences", func() {
r.Get("/", wrap(GetPreferences))
r.Get("/", GetPreferences)
r.Put("/", bind(m.SavePreferencesCommand{}), wrap(SavePreferences))
r.Post("/set-home-dash", bind(m.SavePreferencesCommand{}), wrap(SetHomeDashboard))
})

22
public/app/core/routes/dashboard_loaders.js
View File

@ -7,11 +7,25 @@ function (coreModule) {
coreModule.default.controller('LoadDashboardCtrl', function($scope, $routeParams, dashboardLoaderSrv, backendSrv) {
if (!$routeParams.slug) {
backendSrv.get('/api/dashboards/home').then(function(result) {
var meta = result.meta;
meta.canSave = meta.canShare = meta.canStar = false;
$scope.initDashboard(result, $scope);
backendSrv.get('/api/preferences').then(function(preferences) {
if (preferences !== null && preferences.homeDashboardId !== 0) {
backendSrv.get('/api/dashboards/id/' + preferences.homeDashboardId).then(function(dashSlug) {
$routeParams.type = 'db';
$routeParams.slug = dashSlug.slug;
dashboardLoaderSrv.loadDashboard($routeParams.type, $routeParams.slug).then(function(result) {
$scope.initDashboard(result, $scope);
});
});
} else {
backendSrv.get('/api/dashboards/home').then(function(result) {
var meta = result.meta;
meta.canSave = meta.canShare = meta.canStar = false;
$scope.initDashboard(result, $scope);
});
}
});
return;
}