Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Factored out Contants.*** Role into RoleNames.***

Browse Source 
Renamed 'AllUsers' to 'Everyone'
This commit is contained in:
Tony Valenti
2020-10-16 06:22:52 -05:00
parent 81475fd835
commit 955e7a3856
47 changed files with 298 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Error/Index.razor
View File

@ -8,7 +8,7 @@
protected override async Task OnInitializedAsync()
{
Module module = await ModuleService.GetModuleAsync(ModuleState.ModuleId);
if (UserSecurity.IsAuthorized(PageState.User, Constants.HostRole))
if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host))
{
string message = "A Problem Was Encountered Loading Module " + module.ModuleDefinitionName;
AddModuleMessage(message, MessageType.Error);

2
Oqtane.Client/Modules/Admin/Roles/Users.razor
View File

@ -88,7 +88,7 @@ else
Role role = await RoleService.GetRoleAsync(roleid);
name = role.Name;
users = await UserRoleService.GetUserRolesAsync(PageState.Site.SiteId);
users = users.Where(item => item.Role.Name == Constants.RegisteredRole).ToList();
users = users.Where(item => item.Role.Name == RoleNames.Registered).ToList();
await GetUserRoles();
}
catch (Exception ex)

4
Oqtane.Client/Modules/Admin/UserProfile/Index.razor
View File

@ -79,7 +79,7 @@ else
@foreach (Profile profile in profiles)
{
var p = profile;
if (!p.IsPrivate || UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole))
if (!p.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
{
if (p.Category != category)
{
@ -299,7 +299,7 @@ else
{
settings = SettingService.SetSetting(settings, profile.Name, profile.DefaultValue);
}
if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, Constants.AdminRole))
if (!profile.IsPrivate || UserSecurity.IsAuthorized(PageState.User, RoleNames.Admin))
{
if (profile.IsRequired && string.IsNullOrEmpty(SettingService.GetSetting(settings, profile.Name, string.Empty)))
{

4
Oqtane.Client/Modules/Admin/Users/Index.razor
View File

@ -58,10 +58,10 @@ else
{
if (string.IsNullOrEmpty(_search))
{
return allroles.Where(item => item.Role.Name == Constants.RegisteredRole).ToList();
return allroles.Where(item => item.Role.Name == RoleNames.Registered).ToList();
}
return allroles
.Where(item => item.Role.Name == Constants.RegisteredRole &&
.Where(item => item.Role.Name == RoleNames.Registered &&
(
item.User.Username.Contains(search, StringComparison.OrdinalIgnoreCase) ||
item.User.Email.Contains(search, StringComparison.OrdinalIgnoreCase) ||

2
Oqtane.Client/Modules/Admin/Users/Roles.razor
View File

@ -63,7 +63,7 @@ else
<Row>
<td>@context.Role.Name</td>
<td>
@if (context.Role.Name != Constants.RegisteredRole)
@if (context.Role.Name != RoleNames.Registered)
{
<button type="button" class="btn btn-danger" @onclick=@(async () => await DeleteUserRole(context.UserRoleId))>Delete</button>
}