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

expose org id to frontend, Closes #1907

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-04-29 09:26:12 +02:00
parent 8a986ec340
commit e7c43bf614
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/api/dtos/models.go
View File

@ -21,8 +21,9 @@ type CurrentUser struct {
Email string `json:"email"` Email string `json:"email"`
Name string `json:"name"` Name string `json:"name"`
LightTheme bool `json:"lightTheme"` LightTheme bool `json:"lightTheme"`
OrgRole m.RoleType `json:"orgRole"` OrgId int64 `json:"orgId"`
OrgName string `json:"orgName"` OrgName string `json:"orgName"`
OrgRole m.RoleType `json:"orgRole"`
IsGrafanaAdmin bool `json:"isGrafanaAdmin"` IsGrafanaAdmin bool `json:"isGrafanaAdmin"`
GravatarUrl string `json:"gravatarUrl"` GravatarUrl string `json:"gravatarUrl"`
} }

1
pkg/api/index.go
View File

@ -18,6 +18,7 @@ func setIndexViewData(c *middleware.Context) error {
Email: c.Email, Email: c.Email,
Name: c.Name, Name: c.Name,
LightTheme: c.Theme == "light", LightTheme: c.Theme == "light",
OrgId: c.OrgId,
OrgName: c.OrgName, OrgName: c.OrgName,
OrgRole: c.OrgRole, OrgRole: c.OrgRole,
GravatarUrl: dtos.GetGravatarUrl(c.Email), GravatarUrl: dtos.GetGravatarUrl(c.Email),