From fc0346fe5bf22646eb5b156f6659e89a5a770745 Mon Sep 17 00:00:00 2001 From: Emil Tullstedt Date: Tue, 26 Apr 2022 11:46:26 +0200 Subject: [PATCH] Dashboards: Use home dashboard from org again (#48244) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Dashboards: Use home dashboard from org again * Set homeDashboardID Co-authored-by: Torkel Ödegaard --- pkg/api/dashboard.go | 2 +- pkg/services/preference/prefimpl/pref.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/api/dashboard.go b/pkg/api/dashboard.go index fccd521269f..8809c9fccfb 100644 --- a/pkg/api/dashboard.go +++ b/pkg/api/dashboard.go @@ -409,7 +409,7 @@ func (hs *HTTPServer) postDashboard(c *models.ReqContext, cmd models.SaveDashboa // GetHomeDashboard returns the home dashboard. func (hs *HTTPServer) GetHomeDashboard(c *models.ReqContext) response.Response { - prefsQuery := pref.GetPreferenceWithDefaultsQuery{UserID: c.SignedInUser.UserId} + prefsQuery := pref.GetPreferenceWithDefaultsQuery{OrgID: c.OrgId, UserID: c.SignedInUser.UserId} homePage := hs.Cfg.HomePage preference, err := hs.preferenceService.GetWithDefaults(c.Req.Context(), &prefsQuery) diff --git a/pkg/services/preference/prefimpl/pref.go b/pkg/services/preference/prefimpl/pref.go index 0acc2904c11..d1ebdbe9c00 100644 --- a/pkg/services/preference/prefimpl/pref.go +++ b/pkg/services/preference/prefimpl/pref.go @@ -100,12 +100,14 @@ func (s *Service) Save(ctx context.Context, cmd *pref.SavePreferenceCommand) err } return err } + preference.Timezone = cmd.Timezone preference.WeekStart = cmd.WeekStart preference.Theme = cmd.Theme preference.Updated = time.Now() preference.Version += 1 preference.JSONData = &pref.PreferenceJSONData{} + preference.HomeDashboardID = cmd.HomeDashboardID if cmd.Navbar != nil { preference.JSONData.Navbar = *cmd.Navbar