public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Chore: get user from appcontext rather than store utility (#59926)

Browse Source 
user from appcontext
This commit is contained in:
Ryan McKinley
2022-12-07 07:38:23 -08:00
committed by GitHub
parent e8ed79873a
commit d036225f7b
9 changed files with 31 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/export/entity_store.go
+2 -2
View File
@@ -6,13 +6,13 @@ import (
"sync"
"time"
"github.com/grafana/grafana/pkg/infra/appcontext"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/infra/log"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/dashboardsnapshots"
"github.com/grafana/grafana/pkg/services/playlist"
"github.com/grafana/grafana/pkg/services/sqlstore/session"
"github.com/grafana/grafana/pkg/services/store"
"github.com/grafana/grafana/pkg/services/store/entity"
"github.com/grafana/grafana/pkg/services/store/kind/snapshot"
"github.com/grafana/grafana/pkg/services/user"
@@ -101,7 +101,7 @@ func (e *entityStoreJob) start(ctx context.Context) {
OrgID: 0, // gets filled in from each row
UserID: 0,
}
ctx = store.ContextWithUser(ctx, rowUser)
ctx = appcontext.WithUser(ctx, rowUser)
what := models.StandardKindDashboard
e.status.Count[what] = 0