Merge PR https://github.com/grafana/grafana/pull/16093

1085055d · Torkel Ödegaard · 0091b86e · d11695b8 · 1085055d
Commit 1085055d authored Mar 20, 2019 by Torkel Ödegaard
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

pkg/models/org_user.go
+4 -0

No files found.
--- a/pkg/models/org_user.go
+++ b/pkg/models/org_user.go
@@ -36,6 +36,10 @@ func (r RoleType) Includes(other RoleType) bool {
 		return other != ROLE_ADMIN
 	}

+	if r == ROLE_VIEWER {
+		return other == ROLE_VIEWER
+	}
+
 	return false
 }