opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 23:53:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

include teams on signed in user

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-10-25 15:20:01 +02:00
parent 9edaa3fa8c
commit 70ddf93688
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/models/user.go
View File

@ -165,6 +165,7 @@ type SignedInUser struct {
IsAnonymous bool IsAnonymous bool
HelpFlags1 HelpFlags1 HelpFlags1 HelpFlags1
LastSeenAt time.Time LastSeenAt time.Time
Teams []int64
} }
func (u *SignedInUser) ShouldUpdateLastSeenAt() bool { func (u *SignedInUser) ShouldUpdateLastSeenAt() bool {

11
pkg/services/sqlstore/user.go
View File

@ -387,6 +387,17 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error {
if user.OrgRole == "" { if user.OrgRole == "" {
user.OrgId = -1 user.OrgId = -1
user.OrgName = "Org missing" user.OrgName = "Org missing"
} else {
getTeamsByUserQuery := &m.GetTeamsByUserQuery{OrgId: user.OrgId, UserId: user.UserId}
err = GetTeamsByUser(getTeamsByUserQuery)
if err != nil {
return err
}
user.Teams = make([]int64, len(getTeamsByUserQuery.Result))
for i, t := range getTeamsByUserQuery.Result {
user.Teams[i] = t.Id
}
} }
query.Result = &user query.Result = &user