Skip to content

Commit d325279

Browse files
committed
Mod, Domain before User's LoginName
1 parent b40c396 commit d325279

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,5 @@ jspm_packages/
6060
# Misc
6161
.DS_Store
6262
pipe\[0]
63+
.vs
64+
.vscode

apps/sensenet/src/components/appbar/desktop-nav-menu.tsx

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,11 @@ export const DesktopNavMenu: FunctionComponent = () => {
128128
service.setPersonalSettingsValue({ ...settings, preferDisplayName: event.target.checked })
129129
}
130130

131+
let DomainAndLoginName = ''
132+
if (user?.Domain && user?.LoginName) {
133+
DomainAndLoginName = `${user?.Domain}\\${user?.LoginName}`
134+
}
135+
131136
return (
132137
<div className={clsx(globalClasses.centered, classes.navMenu)}>
133138
<>
@@ -184,7 +189,7 @@ export const DesktopNavMenu: FunctionComponent = () => {
184189
marginLeft: '20px',
185190
color: theme.palette.type === 'light' ? globals.light.textColor : globals.dark.textColor,
186191
},
187-
title: `Full-name: ${user?.DisplayName}` || user?.Name,
192+
title: `Full-name: ${user?.DisplayName || user?.Name}`,
188193
}}
189194
secondaryTypographyProps={{
190195
style: {
@@ -193,10 +198,10 @@ export const DesktopNavMenu: FunctionComponent = () => {
193198
marginLeft: '20px',
194199
color: theme.palette.type === 'light' ? globals.light.textColor : globals.dark.textColor,
195200
},
196-
title: `Login-name: ${user?.LoginName}` || user?.Name,
201+
title: `Login-name: ${DomainAndLoginName || user?.Name}`,
197202
}}
198203
primary={`${user?.DisplayName || user?.Name}`}
199-
secondary={`${user?.LoginName || user?.Name}`}
204+
secondary={`${DomainAndLoginName || user?.Name}`}
200205
/>
201206
</MenuItem>
202207
<MenuItem className={classes.userMenuItem}>

0 commit comments

Comments
 (0)