From cc0cc8dd735d54924510f690f56ae56942d6ad24 Mon Sep 17 00:00:00 2001
From: Carl Bergquist <carl@grafana.com>
Date: Mon, 5 Feb 2018 10:24:48 +0100
Subject: [PATCH] changes to new urlformat for home dashboard (#10738)

---
 pkg/api/dashboard.go                   | 5 +++--
 pkg/models/dashboards.go               | 2 +-
 pkg/services/alerting/eval_context.go  | 2 +-
 pkg/services/sqlstore/dashboard.go     | 2 +-
 public/app/routes/dashboard_loaders.ts | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go
index 0267e2097eb..4478a5af55e 100644
--- a/pkg/api/dashboard.go
+++ b/pkg/api/dashboard.go
@@ -293,10 +293,11 @@ func GetHomeDashboard(c *middleware.Context) Response {
 	}
 
 	if prefsQuery.Result.HomeDashboardId != 0 {
-		slugQuery := m.GetDashboardSlugByIdQuery{Id: prefsQuery.Result.HomeDashboardId}
+		slugQuery := m.GetDashboardRefByIdQuery{Id: prefsQuery.Result.HomeDashboardId}
 		err := bus.Dispatch(&slugQuery)
 		if err == nil {
-			dashRedirect := dtos.DashboardRedirect{RedirectUri: "db/" + slugQuery.Result}
+			url := m.GetDashboardUrl(slugQuery.Result.Uid, slugQuery.Result.Slug)
+			dashRedirect := dtos.DashboardRedirect{RedirectUri: url}
 			return Json(200, &dashRedirect)
 		} else {
 			log.Warn("Failed to get slug from database, %s", err.Error())
diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go
index 089a98c4f00..12216718b44 100644
--- a/pkg/models/dashboards.go
+++ b/pkg/models/dashboards.go
@@ -293,7 +293,7 @@ type DashboardRef struct {
 	Slug string
 }
 
-type GetDashboardUIDByIdQuery struct {
+type GetDashboardRefByIdQuery struct {
 	Id     int64
 	Result *DashboardRef
 }
diff --git a/pkg/services/alerting/eval_context.go b/pkg/services/alerting/eval_context.go
index 60c5530d486..d598203d675 100644
--- a/pkg/services/alerting/eval_context.go
+++ b/pkg/services/alerting/eval_context.go
@@ -90,7 +90,7 @@ func (c *EvalContext) GetDashboardUID() (*m.DashboardRef, error) {
 		return c.dashboardRef, nil
 	}
 
-	uidQuery := &m.GetDashboardUIDByIdQuery{Id: c.Rule.DashboardId}
+	uidQuery := &m.GetDashboardRefByIdQuery{Id: c.Rule.DashboardId}
 	if err := bus.Dispatch(uidQuery); err != nil {
 		return nil, err
 	}
diff --git a/pkg/services/sqlstore/dashboard.go b/pkg/services/sqlstore/dashboard.go
index 16270b2ce1d..2e2537cacb9 100644
--- a/pkg/services/sqlstore/dashboard.go
+++ b/pkg/services/sqlstore/dashboard.go
@@ -569,7 +569,7 @@ func GetDashboardsBySlug(query *m.GetDashboardsBySlugQuery) error {
 	return nil
 }
 
-func GetDashboardUIDById(query *m.GetDashboardUIDByIdQuery) error {
+func GetDashboardUIDById(query *m.GetDashboardRefByIdQuery) error {
 	var rawSql = `SELECT uid, slug from dashboard WHERE Id=?`
 
 	us := &m.DashboardRef{}
diff --git a/public/app/routes/dashboard_loaders.ts b/public/app/routes/dashboard_loaders.ts
index e17ca6fb054..7d3099a54fd 100644
--- a/public/app/routes/dashboard_loaders.ts
+++ b/public/app/routes/dashboard_loaders.ts
@@ -9,7 +9,7 @@ export class LoadDashboardCtrl {
     if (!$routeParams.uid && !$routeParams.slug) {
       backendSrv.get('/api/dashboards/home').then(function(homeDash) {
         if (homeDash.redirectUri) {
-          $location.path('dashboard/' + homeDash.redirectUri);
+          $location.path(homeDash.redirectUri);
         } else {
           var meta = homeDash.meta;
           meta.canSave = meta.canShare = meta.canStar = false;