IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Add user service method SetUsingOrg and GetSignedInUserWithCacheCtx (#53343)

Browse Source 
* Chore: Add user service method SetUsingOrg

* Chore: Add user service method GetSignedInUserWithCacheCtx

* Use method GetSignedInUserWithCacheCtx from user service

* Fix lint after rebase

* Fix lint

* Fix lint error

* roll back some changes

* Roll back changes in api and middleware

* Add xorm tags to SignedInUser ID fields
This commit is contained in:
idafurjes
2022-08-11 13:28:55 +02:00
committed by GitHub
parent ca72cd570e
commit a14621fff6
191 changed files with 1108 additions and 1049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/services/store/service.go
View File

@@ -41,8 +41,8 @@ const brandingStorage = "branding"
const SystemBrandingStorage = "system/" + brandingStorage
var (
SystemBrandingReader = &user.SignedInUser{OrgId: ac.GlobalOrgID}
SystemBrandingAdmin = &user.SignedInUser{OrgId: ac.GlobalOrgID}
SystemBrandingReader = &user.SignedInUser{OrgID: ac.GlobalOrgID}
SystemBrandingAdmin = &user.SignedInUser{OrgID: ac.GlobalOrgID}
)
const MAX_UPLOAD_SIZE = 1 * 1024 * 1024 // 3MB
@@ -273,7 +273,7 @@ func getOrgId(user *user.SignedInUser) int64 {
return ac.GlobalOrgID
}
return user.OrgId
return user.OrgID
}
func (s *standardStorageService) List(ctx context.Context, user *user.SignedInUser, path string) (*StorageListFrame, error) {
@@ -488,7 +488,7 @@ func (s *standardStorageService) getWorkflowOptions(ctx context.Context, user *u
}
scope, _ := splitFirstSegment(path)
root, _ := s.tree.getRoot(user.OrgId, scope)
root, _ := s.tree.getRoot(user.OrgID, scope)
if root == nil {
return options, fmt.Errorf("can not read")
}