Skip to content

Commit edb3bb1

Browse files
committed
#2267 change menu controller to return proper values for svelte menu creation
1 parent bbd6f7a commit edb3bb1

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

Console/BExIS.Web.Shell/Controllers/MenuController.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ public MenuController(UserManager userManager)
2525
public JsonResult Index()
2626
{
2727
string userName = "";
28+
string fullName = "";
2829
bool isAuthenticated = false;
2930

3031
if (HttpContext.User != null && !string.IsNullOrEmpty(HttpContext.User.Identity.Name))
3132
{
3233
var user = _userManager.FindByNameAsync(HttpContext.User.Identity.Name).Result;
3334

34-
userName = user.FullName ?? user.UserName;
35+
userName = user.UserName;
36+
fullName = user.FullName ?? user.UserName;
3537
isAuthenticated = true;
3638
}
3739
else
@@ -42,6 +44,7 @@ public JsonResult Index()
4244
if (user != null)
4345
{
4446
userName = user.Name;
47+
fullName = user.FullName ?? user.UserName;
4548
isAuthenticated = true;
4649
}
4750
}
@@ -71,7 +74,7 @@ public JsonResult Index()
7174
MenuHelper.AdditionalHelpBar(menu.LaunchBar.FirstOrDefault(i =>i.Title.Equals("Help")));
7275

7376

74-
menu.AccountBar = MenuHelper.AccountBar(isAuthenticated, userName);
77+
menu.AccountBar = MenuHelper.AccountBar(isAuthenticated, fullName);
7578

7679
if (Session.GetTenant().ExtendedMenus != null)
7780
menu.Extended = MenuHelper.ExtendedMenu(Session.GetTenant().ExtendedMenus.Element("ExtendedMenu"));

0 commit comments

Comments
 (0)