From 003f14003eb80dab0e9ed136ff5e13a6eee852d0 Mon Sep 17 00:00:00 2001 From: Shaun Walker Date: Mon, 7 Mar 2022 16:52:40 -0500 Subject: [PATCH] Fixed issue with IHostResources not being registered properly --- Oqtane.Client/Modules/Controls/PermissionGrid.razor | 2 +- Oqtane.Client/Services/ServiceBase.cs | 2 +- Oqtane.Server/Pages/_Host.cshtml.cs | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Oqtane.Client/Modules/Controls/PermissionGrid.razor b/Oqtane.Client/Modules/Controls/PermissionGrid.razor index a8d103ef..d1777a68 100644 --- a/Oqtane.Client/Modules/Controls/PermissionGrid.razor +++ b/Oqtane.Client/Modules/Controls/PermissionGrid.razor @@ -252,7 +252,7 @@ for (int i = 0; i < _permissions.Count; i++) { permission = _permissions[i]; - List ids = permission.Permissions.Split(';').ToList(); + List ids = permission.Permissions.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList(); ids.Remove("!" + RoleNames.Everyone); // remove deny all users ids.Remove("!" + RoleNames.Registered); // remove deny registered users if (UserSecurity.IsAuthorized(PageState.User, RoleNames.Host)) diff --git a/Oqtane.Client/Services/ServiceBase.cs b/Oqtane.Client/Services/ServiceBase.cs index ecd6c37b..2b2c1df5 100644 --- a/Oqtane.Client/Services/ServiceBase.cs +++ b/Oqtane.Client/Services/ServiceBase.cs @@ -240,7 +240,7 @@ namespace Oqtane.Services [Obsolete("This property of ServiceBase is deprecated. Cross tenant service calls are not supported.", false)] public Alias Alias { get; set; } - [Obsolete("This method is obsolete. Use CreateApiUrl(string entityName, int entityId) instead.", false)] + [Obsolete("This method is obsolete. Use CreateAuthorizationPolicyUrl(string url, string entityName, int entityId) where entityName = EntityNames.Module instead.", false)] public string CreateAuthorizationPolicyUrl(string url, int entityId) { return url + ((url.Contains("?")) ? "&" : "?") + "entityid=" + entityId.ToString(); diff --git a/Oqtane.Server/Pages/_Host.cshtml.cs b/Oqtane.Server/Pages/_Host.cshtml.cs index bfb73379..254cc96d 100644 --- a/Oqtane.Server/Pages/_Host.cshtml.cs +++ b/Oqtane.Server/Pages/_Host.cshtml.cs @@ -395,6 +395,7 @@ namespace Oqtane.Pages var obj = Activator.CreateInstance(type) as IHostResources; foreach (var resource in obj.Resources) { + resource.Declaration = ResourceDeclaration.Global; ProcessResource(resource, 0); } }