added perfectly permssion checking coondition and fixed previous mistake
This commit is contained in:
parent
732cfbef3e
commit
374e023cde
@ -228,8 +228,8 @@ namespace Marco.Pms.Services.Controllers
|
||||
[HttpGet("sidebar/menu-section")]
|
||||
public async Task<IActionResult> GetAppSideBarMenu()
|
||||
{
|
||||
var loggedUser = await _userHelper.GetCurrentUserAsync();
|
||||
var employeeId = Guid.Parse(loggedUser.Id);
|
||||
var loggedUser = await _userHelper.GetCurrentEmployeeAsync();
|
||||
var employeeId = loggedUser.Id;
|
||||
|
||||
var menus = await _sideBarMenuHelper.GetAllMenuSectionsAsync();
|
||||
|
||||
@ -268,10 +268,9 @@ namespace Marco.Pms.Services.Controllers
|
||||
var allowedSubmenus = new List<SubMenuItem>();
|
||||
foreach (var sm in item.Submenu)
|
||||
{
|
||||
bool smAllowed = false;
|
||||
if (sm.PermissionKeys == null || !sm.PermissionKeys.Any())
|
||||
{
|
||||
smAllowed = true;
|
||||
allowedSubmenus.Add(sm);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -281,15 +280,12 @@ namespace Marco.Pms.Services.Controllers
|
||||
{
|
||||
if (await _permissions.HasPermission(employeeId, permissionId))
|
||||
{
|
||||
smAllowed = true;
|
||||
allowedSubmenus.Add(sm);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (smAllowed)
|
||||
allowedSubmenus.Add(sm);
|
||||
}
|
||||
item.Submenu = allowedSubmenus;
|
||||
}
|
||||
@ -305,7 +301,6 @@ namespace Marco.Pms.Services.Controllers
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user