Merge branch 'develop' into panel-title-menu-ux

2017-08-02 09:56:08 +02:00
parent e312408855 ebcbcdc27a
commit 9fb60c2fc8
116 changed files with 5196 additions and 1071 deletions
@@ -162,6 +162,14 @@ type SignedInUser struct {
 	HelpFlags1     HelpFlags1
 }

+func (user *SignedInUser) HasRole(role RoleType) bool {
+	if user.IsGrafanaAdmin {
+		return true
+	}
+
+	return user.OrgRole.Includes(role)
+}
+
 type UserProfileDTO struct {
 	Id             int64  `json:"id"`
 	Email          string `json:"email"`