From fe6088e60e9d8c74d57f828a3758a97b91258727 Mon Sep 17 00:00:00 2001 From: Selene Date: Tue, 17 Jan 2023 10:52:47 +0100 Subject: [PATCH] [v9.3.x] Dashboards: Add org_id in dashboards query (#61599) Manual backport --- pkg/models/dashboards.go | 1 + pkg/services/dashboards/database/database.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkg/models/dashboards.go b/pkg/models/dashboards.go index fc8f781909e..38879e8d36c 100644 --- a/pkg/models/dashboards.go +++ b/pkg/models/dashboards.go @@ -279,6 +279,7 @@ type GetDashboardTagsQuery struct { type GetDashboardsQuery struct { DashboardIds []int64 DashboardUIds []string + OrgID int64 Result []*Dashboard } diff --git a/pkg/services/dashboards/database/database.go b/pkg/services/dashboards/database/database.go index faf257c7195..d939847993a 100644 --- a/pkg/services/dashboards/database/database.go +++ b/pkg/services/dashboards/database/database.go @@ -973,6 +973,9 @@ func (d *DashboardStore) GetDashboards(ctx context.Context, query *models.GetDas } else { session = sess.In("uid", query.DashboardUIds) } + if query.OrgID > 0 { + session = sess.Where("org_id = ?", query.OrgID) + } err := session.Find(&dashboards) query.Result = dashboards