Skip to content

Commit c41c771

Browse files
committed
fix(home dashboard): fixed handling error when default dashboard is not found, fixes grafana#5141
1 parent f1ec270 commit c41c771

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

pkg/api/dashboard.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/grafana/grafana/pkg/api/dtos"
1010
"github.com/grafana/grafana/pkg/bus"
11+
"github.com/grafana/grafana/pkg/log"
1112
"github.com/grafana/grafana/pkg/metrics"
1213
"github.com/grafana/grafana/pkg/middleware"
1314
m "github.com/grafana/grafana/pkg/models"
@@ -167,14 +168,12 @@ func GetHomeDashboard(c *middleware.Context) {
167168
if prefsQuery.Result.HomeDashboardId != 0 {
168169
slugQuery := m.GetDashboardSlugByIdQuery{Id: prefsQuery.Result.HomeDashboardId}
169170
err := bus.Dispatch(&slugQuery)
170-
if err != nil {
171-
c.JsonApiErr(500, "Failed to get slug from database", err)
172-
return
171+
if err == nil {
172+
dashRedirect := dtos.DashboardRedirect{RedirectUri: "db/" + slugQuery.Result}
173+
c.JSON(200, &dashRedirect)
174+
} else {
175+
log.Warn("Failed to get slug from database, %s", err.Error())
173176
}
174-
175-
dashRedirect := dtos.DashboardRedirect{RedirectUri: "db/" + slugQuery.Result}
176-
c.JSON(200, &dashRedirect)
177-
return
178177
}
179178

180179
filePath := path.Join(setting.StaticRootPath, "dashboards/home.json")

0 commit comments

Comments
 (0)