From b88cd08177191aa2f94b3d4d5e38b43d1fc227e6 Mon Sep 17 00:00:00 2001
From: Eric Leijonmarck <eric.leijonmarck@gmail.com>
Date: Mon, 11 Oct 2021 16:00:54 +0100
Subject: [PATCH] feat: fallback for displayname of non-fixed role without
 displayname (#40277)

---
 pkg/services/accesscontrol/models.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkg/services/accesscontrol/models.go b/pkg/services/accesscontrol/models.go
index 32b8954594b..59e86235b3b 100644
--- a/pkg/services/accesscontrol/models.go
+++ b/pkg/services/accesscontrol/models.go
@@ -95,6 +95,9 @@ func (r RoleDTO) GetDisplayName() string {
 	if r.IsFixed() && r.DisplayName == "" {
 		r.DisplayName = fallbackDisplayName(r.Name)
 	}
+	if r.DisplayName == "" {
+		return r.Name
+	}
 	return r.DisplayName
 }