From 1b457b8257bc7d682f625f8a68ff649527c54235 Mon Sep 17 00:00:00 2001
From: lorenzulrich <lorenz.ulrich@visol.ch>
Date: Mon, 4 Dec 2023 12:03:55 +0100
Subject: [PATCH] TASK: Use role label in list users/new user view if available

---
 Neos.Neos/Resources/Private/Partials/Module/Shared/Roles.html   | 2 +-
 .../Private/Templates/Module/Administration/Users/New.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Neos.Neos/Resources/Private/Partials/Module/Shared/Roles.html b/Neos.Neos/Resources/Private/Partials/Module/Shared/Roles.html
index 4f23b279335..6dfc77d56e3 100644
--- a/Neos.Neos/Resources/Private/Partials/Module/Shared/Roles.html
+++ b/Neos.Neos/Resources/Private/Partials/Module/Shared/Roles.html
@@ -1,7 +1,7 @@
 {namespace neos=Neos\Neos\ViewHelpers}
 <f:for each="{roles}" as="role" iteration="iteration">
 	<span class="neos-label" title="{f:render(section: 'tooltip', arguments: {role: role})}" data-neos-toggle="tooltip" data-placement="right" data-html="true">
-		{role.name}
+		{f:if(condition: role.label, then: role.label, else: role.name)}
 	</span>
 </f:for>
 
diff --git a/Neos.Neos/Resources/Private/Templates/Module/Administration/Users/New.html b/Neos.Neos/Resources/Private/Templates/Module/Administration/Users/New.html
index 2a975f06173..b0dfdf9e473 100644
--- a/Neos.Neos/Resources/Private/Templates/Module/Administration/Users/New.html
+++ b/Neos.Neos/Resources/Private/Templates/Module/Administration/Users/New.html
@@ -50,7 +50,7 @@ <h2>{neos:backend.translate(id: 'user.new.subtitle', value: 'Create a new user',
 						<div class="neos-controls">
 							<label for="roles-{rolesIteration.cycle}" class="neos-checkbox" title="{role.packageKey}" data-neos-toggle="tooltip" data-placement="right">
 								<f:form.checkbox name="roleIdentifiers" multiple="true" value="{role.identifier}" id="roles-{rolesIteration.cycle}" /><span></span>
-								{role.name}
+								{f:if(condition: role.label, then: role.label, else: role.name)}
 							</label>
 						</div>
 					</f:for>