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

This commit is contained in:
Torkel Ödegaard
2017-06-19 18:55:34 -04:00
3 changed files with 8 additions and 3 deletions

View File

@@ -24,7 +24,8 @@ func (p PermissionType) String() string {
// Typed errors
var (
ErrDashboardAclInfoMissing = errors.New("User id and user group id cannot both be empty for a dashboard permission.")
ErrDashboardAclInfoMissing = errors.New("User id and user group id cannot both be empty for a dashboard permission.")
ErrDashboardPermissionDashboardEmpty = errors.New("Dashboard Id must be greater than zero for a dashboard permission.")
)
// Dashboard ACL model