expose orgId via currentUser object. fixes #1907

pkg/api/dtos/models.go

@@ -23,6 +23,7 @@ type CurrentUser struct {
 	LightTheme     bool       `json:"lightTheme"`
 	OrgRole        m.RoleType `json:"orgRole"`
 	OrgName        string     `json:"orgName"`
+	OrgId          int64      `json:"orgId"`
 	IsGrafanaAdmin bool       `json:"isGrafanaAdmin"`
 	GravatarUrl    string     `json:"gravatarUrl"`
 }

pkg/api/index.go

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