Merge branch 'dashboard_folders' of github.com:grafana/grafana into dashboard_folders

2017-06-22 17:11:39 -04:00
parent 9c6c8c0f3f 1d43bfbf3f
commit 545b02139d
3 changed files with 66 additions and 19 deletions
@@ -36,6 +36,10 @@ func (g *DashboardGuardian) CanView() (bool, error) {
 	return g.HasPermission(m.PERMISSION_VIEW)
 }

+func (g *DashboardGuardian) CanAdmin() (bool, error) {
+	return g.HasPermission(m.PERMISSION_ADMIN)
+}
+
 func (g *DashboardGuardian) HasPermission(permission m.PermissionType) (bool, error) {
 	if g.user.OrgRole == m.ROLE_ADMIN {
 		return true, nil