lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#18639: Fixing layers not taking UrlPrefix into account

Browse Source 
Work Item: 18639
This commit is contained in:
Sebastien Ros
2012-07-09 10:38:53 -07:00
parent cc5477eee2
commit bd20fecd47
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Orchard.Web/Modules/Orchard.Widgets/RuleEngine/UrlRuleProvider.cs
View File

@@ -1,13 +1,17 @@
using System; using System;
using System.Web;
using Orchard.Environment.Configuration;
using Orchard.Mvc; using Orchard.Mvc;
using Orchard.Widgets.Services; using Orchard.Widgets.Services;
namespace Orchard.Widgets.RuleEngine { namespace Orchard.Widgets.RuleEngine {
public class UrlRuleProvider : IRuleProvider { public class UrlRuleProvider : IRuleProvider {
private readonly IHttpContextAccessor _httpContextAccessor; private readonly IHttpContextAccessor _httpContextAccessor;
private readonly ShellSettings _shellSettings;
public UrlRuleProvider(IHttpContextAccessor httpContextAccessor) { public UrlRuleProvider(IHttpContextAccessor httpContextAccessor, ShellSettings shellSettings) {
_httpContextAccessor = httpContextAccessor; _httpContextAccessor = httpContextAccessor;
_shellSettings = shellSettings;
} }
public void Process(RuleContext ruleContext) { public void Process(RuleContext ruleContext) {
@@ -21,7 +25,11 @@ namespace Orchard.Widgets.RuleEngine {
var appPath = context.Request.ApplicationPath; var appPath = context.Request.ApplicationPath;
if (appPath == "/") if (appPath == "/")
appPath = ""; appPath = "";
url = string.Format("{0}/{1}", appPath, url);
if(!String.IsNullOrEmpty(_shellSettings.RequestUrlPrefix))
appPath = String.Concat(appPath, "/", _shellSettings.RequestUrlPrefix);
url = String.Concat(appPath, "/", url);
} }
if (!url.Contains("?")) if (!url.Contains("?"))