Took Database layout changes into account in frontend pages
This commit is contained in:
@@ -177,7 +177,8 @@
|
||||
}
|
||||
|
||||
_group.Permissions.Add(new Permission {
|
||||
PermissionName = _permissionToAdd
|
||||
PermissionName = _permissionToAdd,
|
||||
GrantedAt = DateTime.Now
|
||||
});
|
||||
|
||||
_permissionToAdd = null;
|
||||
@@ -255,7 +256,12 @@
|
||||
return;
|
||||
}
|
||||
|
||||
await Groups.CreatePermissionGroup(_group);
|
||||
await Groups.CreatePermissionGroup(new PermissionGroup {
|
||||
Description = _group.Description,
|
||||
IsDefaultGroup = _group.IsDefaultGroup,
|
||||
Permissions = _group.Permissions,
|
||||
Name = "group." + _group.GroupName
|
||||
});
|
||||
|
||||
if (ReloadPage is not null)
|
||||
await ReloadPage.Invoke();
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
<option selected>Select group</option>
|
||||
|
||||
@foreach (var group in _allGroups) {
|
||||
@if (_userGroups.All(g => g.Name != group.Name)) {
|
||||
@if (_userGroups?.All(g => g.Name != group.Name) == true) {
|
||||
<option value="@group.Name">@group.Name.Replace("group.", "")</option>
|
||||
}
|
||||
}
|
||||
@@ -125,7 +125,7 @@
|
||||
}
|
||||
|
||||
_user = user;
|
||||
_userGroups = _user.Permissions.Where(p => p.PermissionName.StartsWith("group.")).Select(p => p.Group).ToList();
|
||||
_userGroups = await Groups.GetUserGroups(user);
|
||||
_allGroups = await Groups.GetPermissionGroups();
|
||||
await _modal.ShowAsync();
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
_hasError = true;
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
Navigator.NavigateTo(string.IsNullOrEmpty(RedirectAfter) ? DefaultRedirect : RedirectAfter, true);
|
||||
}
|
||||
}
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
.field-wrapper {
|
||||
margin-top: 25vh;
|
||||
min-width: 30vw;
|
||||
min-width: 500px;
|
||||
|
||||
padding: 30px;
|
||||
border: 2px solid #ced4da;
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
<BSNavbarToggle/>
|
||||
</Toggler>
|
||||
<Content>
|
||||
<BSNav MarginEnd="Margins.Auto" MarginBottom="Margins.Small" Class="mb-lg-0">
|
||||
<BSNav MarginEnd="Margins.Auto" Class="mb-lg-0">
|
||||
<BSNavItem IsActive="IsDashboardActive()" OnClick="NavigateToDashboard">Dashboard</BSNavItem>
|
||||
|
||||
@foreach (var nav in Subpages) {
|
||||
|
||||
@@ -97,6 +97,7 @@
|
||||
|
||||
@inject IUserRepository UserService
|
||||
@inject IPermissionRepository PermissionsService
|
||||
@inject IGroupRepository Groups
|
||||
@inject SweetAlertService Alerts
|
||||
@inject ITokenContext Auth
|
||||
|
||||
@@ -119,7 +120,7 @@
|
||||
_users = await UserService.GetUsers();
|
||||
|
||||
foreach (var user in _users) {
|
||||
var groups = user.Permissions.Where(p => p.PermissionName.StartsWith("group.")).Select(p => p.Group).ToList();
|
||||
var groups = await Groups.GetUserGroups(user);
|
||||
_userGroups.Add(user.Id, groups.LastOrDefault());
|
||||
}
|
||||
|
||||
@@ -134,7 +135,7 @@
|
||||
_users = await UserService.GetUsers();
|
||||
|
||||
foreach (var user in _users) {
|
||||
var groups = user.Permissions.Where(p => p.PermissionName.StartsWith("group.")).Select(p => p.Group).ToList();
|
||||
var groups = await Groups.GetUserGroups(user);
|
||||
_userGroups.Add(user.Id, groups.LastOrDefault());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user