Merge branch 'dashboard-acl-ux2' of github.com:grafana/grafana into dashboard-acl-ux2

pkg/api/dashboard_permission.go

@@ -30,7 +30,10 @@ func GetDashboardPermissionList(c *m.ReqContext) Response {
 
 	for _, perm := range acl {
 		perm.UserAvatarUrl = dtos.GetGravatarUrl(perm.UserEmail)
-		perm.TeamAvatarUrl = dtos.GetGravatarUrl(perm.TeamEmail)
+
+		if perm.TeamId > 0 {
+			perm.TeamAvatarUrl = dtos.GetGravatarUrlWithDefault(perm.TeamEmail, perm.Team)
+		}
 		if perm.Slug != "" {
 			perm.Url = m.GetDashboardFolderUrl(perm.IsFolder, perm.Uid, perm.Slug)
 		}

pkg/api/folder_permission.go

@@ -33,6 +33,12 @@ func GetFolderPermissionList(c *m.ReqContext) Response {
 		perm.FolderId = folder.Id
 		perm.DashboardId = 0
 
+		perm.UserAvatarUrl = dtos.GetGravatarUrl(perm.UserEmail)
+
+		if perm.TeamId > 0 {
+			perm.TeamAvatarUrl = dtos.GetGravatarUrlWithDefault(perm.TeamEmail, perm.Team)
+		}
+
 		if perm.Slug != "" {
 			perm.Url = m.GetDashboardFolderUrl(perm.IsFolder, perm.Uid, perm.Slug)
 		}