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

Chore: Add context to org users (#39526)

Browse Source 
* Add context to org users

* Fix go lint

* Roll back xorm refactor

* Use WithTransactionalDbSession

* Update sqlstore.go

Fix typo

* Update org_users.go

Fix typo
This commit is contained in:
idafurjes
2021-09-27 16:43:16 +02:00
committed by GitHub
parent 60f5bceda5
commit 65ebb04cf3
8 changed files with 194 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/stats_test.go
+3 -3
View File
@@ -88,7 +88,7 @@ func populateDB(t *testing.T, sqlStore *SQLStore) {
UserId: users[1].Id,
Role: models.ROLE_EDITOR,
}
err = AddOrgUser(cmd)
err = sqlStore.AddOrgUser(context.Background(), cmd)
require.NoError(t, err)
// add 3rd user as viewer
@@ -97,7 +97,7 @@ func populateDB(t *testing.T, sqlStore *SQLStore) {
UserId: users[2].Id,
Role: models.ROLE_VIEWER,
}
err = AddOrgUser(cmd)
err = sqlStore.AddOrgUser(context.Background(), cmd)
require.NoError(t, err)
// get 2nd user's organisation
@@ -112,7 +112,7 @@ func populateDB(t *testing.T, sqlStore *SQLStore) {
UserId: users[0].Id,
Role: models.ROLE_ADMIN,
}
err = AddOrgUser(cmd)
err = sqlStore.AddOrgUser(context.Background(), cmd)
require.NoError(t, err)
// update 1st user last seen at