From 8086c01fb88fdfc3cee4739a77ab928b9e3d9ead Mon Sep 17 00:00:00 2001 From: Hazzamanic Date: Thu, 11 Apr 2024 20:41:34 +0100 Subject: [PATCH] 7919: The Alias UI links for sites using UrlPrefix are broken (#7930) * AliasUI: removing UrlPrefix addition to url. Fixing issue in Href() that strips first / in urls for sites using UrlPrefix * Simplifying fix for WebViewPage.Href for tenants with URL prefix * Code styling WebViewPage --------- Co-authored-by: Benedek Farkas --- .../Views/Admin/IndexManaged.cshtml | 6 ++-- .../Views/Admin/IndexUnmanaged.cshtml | 6 ++-- .../Mvc/ViewEngines/Razor/WebViewPage.cs | 31 +++++++++---------- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexManaged.cshtml b/src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexManaged.cshtml index 7bcee7ab4..3b4fbceeb 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexManaged.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexManaged.cshtml @@ -6,8 +6,6 @@ @using Orchard.Utility.Extensions @{ - var urlPrefix = WorkContext.Resolve().RequestUrlPrefix; - Layout.Title = T("Manage Aliases").Text; var aliasService = WorkContext.Resolve(); AdminIndexOptions options = Model.Options; @@ -59,10 +57,10 @@ - @Html.Link(alias.Path == String.Empty ? "/" : alias.Path, Href("~/" + urlPrefix + alias.Path)) + @Html.Link(alias.Path == String.Empty ? "/" : alias.Path, Href("~/" + alias.Path)) - @Html.Link(url, Href("~/" + urlPrefix + "/" + url)) + @Html.Link(url, Href("~/" + url)) } diff --git a/src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexUnmanaged.cshtml b/src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexUnmanaged.cshtml index 9a26865b7..2f5fff1fc 100644 --- a/src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexUnmanaged.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Alias/Views/Admin/IndexUnmanaged.cshtml @@ -6,8 +6,6 @@ @using Orchard.Utility.Extensions @{ - var urlPrefix = WorkContext.Resolve().RequestUrlPrefix; - Layout.Title = T("Manage Aliases").Text; var aliasService = WorkContext.Resolve(); AdminIndexOptions options = Model.Options; @@ -73,10 +71,10 @@ - @Html.Link(alias.Path == String.Empty ? "/" : alias.Path, Href("~/" + urlPrefix + alias.Path)) + @Html.Link(alias.Path == String.Empty ? "/" : alias.Path, Href("~/" + alias.Path)) - @Html.Link(url, Href("~/" + urlPrefix + "/" + url)) + @Html.Link(url, Href("~/" + url)) @Html.ActionLink(T("Edit").Text, "Edit", new { path = alias.Path == String.Empty ? "/" : alias.Path })@T(" | ") diff --git a/src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs b/src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs index 516e17fe3..1cb7009e5 100644 --- a/src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs +++ b/src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs @@ -23,22 +23,22 @@ namespace Orchard.Mvc.ViewEngines.Razor { private object _display; private object _layout; - public Localizer T { + public Localizer T { get { // first time used, create it - if(_localizer == NullLocalizer.Instance) { - + if (_localizer == NullLocalizer.Instance) { + // if the Model is a shape, get localization scopes from binding sources // e.g., Logon.cshtml in a theme, overriging Users/Logon.cshtml, needs T to // fallback to the one in Users var shape = Model as IShape; - if(shape != null && shape.Metadata.BindingSources.Count > 1) { + if (shape != null && shape.Metadata.BindingSources.Count > 1) { var localizers = shape.Metadata.BindingSources.Reverse().Select(scope => LocalizationUtilities.Resolve(ViewContext, scope)).ToList(); - _localizer = (text, args) => { - foreach(var localizer in localizers) { + _localizer = (text, args) => { + foreach (var localizer in localizers) { var hint = localizer(text, args); // if not localized using this scope, use next scope - if(hint.Text != text) { + if (hint.Text != text) { return hint; } } @@ -54,7 +54,7 @@ namespace Orchard.Mvc.ViewEngines.Razor { } return _localizer; - } + } } public dynamic Display { get { return _display; } } @@ -79,7 +79,7 @@ namespace Orchard.Mvc.ViewEngines.Razor { } private IAuthorizer _authorizer; - public IAuthorizer Authorizer { + public IAuthorizer Authorizer { get { return _authorizer ?? (_authorizer = WorkContext.Resolve()); } @@ -114,7 +114,7 @@ namespace Orchard.Mvc.ViewEngines.Razor { } private string[] _commonLocations; - public string[] CommonLocations { get { return _commonLocations ?? (_commonLocations = WorkContext.Resolve().CommonLocations); } } + public string[] CommonLocations { get { return _commonLocations ?? (_commonLocations = WorkContext.Resolve().CommonLocations); } } public void RegisterImageSet(string imageSet, string style = "", int size = 16) { // hack to fake the style "alternate" for now so we don't have to change stylesheet names when this is hooked up @@ -150,7 +150,7 @@ namespace Orchard.Mvc.ViewEngines.Razor { base.InitHelpers(); WorkContext = ViewContext.GetWorkContext(); - + _display = DisplayHelperFactory.CreateHelper(ViewContext, this); _layout = WorkContext.Layout; } @@ -190,11 +190,10 @@ namespace Orchard.Mvc.ViewEngines.Razor { _tenantPrefix = WorkContext.Resolve().RequestUrlPrefix ?? ""; } - if (!String.IsNullOrEmpty(_tenantPrefix) - && path.StartsWith("~/") - && !CommonLocations.Any(gpp=>path.StartsWith(gpp, StringComparison.OrdinalIgnoreCase)) - ) { - return base.Href("~/" + _tenantPrefix + path.Substring(2), pathParts); + if (!string.IsNullOrWhiteSpace(_tenantPrefix) + && path.StartsWith("~/") + && !CommonLocations.Any(gpp => path.StartsWith(gpp, StringComparison.OrdinalIgnoreCase))) { + return base.Href("~/" + _tenantPrefix + path.Substring(1), pathParts); } return base.Href(path, pathParts);