lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-12-02 19:44:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#18639: Fixing multi-tenancy Url Prefix

Browse Source 
Work Item: 18639

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2012-07-02 17:23:00 -07:00
parent 3bee0e4cce
commit ed4be02336
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Web/Modules/Orchard.MultiTenancy/Extensions/UrlHelperExtensions.cs
View File

@@ -15,12 +15,12 @@ namespace Orchard.MultiTenancy.Extensions {
!string.IsNullOrEmpty(tenantShellSettings.RequestUrlHost)
? tenantShellSettings.RequestUrlHost + port : host);
if (!string.IsNullOrEmpty(tenantShellSettings.RequestUrlPrefix))
result += "/" + tenantShellSettings.RequestUrlPrefix;
if (!string.IsNullOrEmpty(urlHelper.RequestContext.HttpContext.Request.ApplicationPath))
result += urlHelper.RequestContext.HttpContext.Request.ApplicationPath;
if (!string.IsNullOrEmpty(tenantShellSettings.RequestUrlPrefix))
result += "/" + tenantShellSettings.RequestUrlPrefix;
return result;
}
}

5
src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.cshtml
View File

@@ -15,6 +15,11 @@
@Html.TextBoxFor(m => m.RequestUrlHost, new { @class = "textMedium" })
<span class="hint">@T("Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\"")</span>
</div>
<div>
<label for="@Html.FieldIdFor(m => m.RequestUrlPrefix)">@T("URL prefix")</label>
@Html.TextBoxFor(m => m.RequestUrlPrefix, new { @class = "textMedium" })
<span class="hint">@T("Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"")</span>
</div>
</fieldset>
<fieldset>
<legend>@T("Database Setup")</legend>

5
src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
View File

@@ -14,6 +14,11 @@
@Html.TextBoxFor(m => m.RequestUrlHost, new { @class = "textMedium" })
<span class="hint">@T("Example: If host is \"orchardproject.net\", the tenant site URL is \"http://orchardproject.net/\"")</span>
</div>
<div>
<label for="@Html.FieldIdFor(m => m.RequestUrlPrefix)">@T("URL prefix")</label>
@Html.TextBoxFor(m => m.RequestUrlPrefix, new { @class = "textMedium" })
<span class="hint">@T("Example: If prefix is \"site1\", the tenant URL prefix is \"http://orchardproject.net/site1\"")</span>
</div>
</fieldset>
<fieldset>
<legend>@T("Database Setup")</legend>

7
src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
View File

@@ -17,6 +17,7 @@ namespace Orchard.Setup.Controllers {
[ValidateInput(false), Themed]
public class SetupController : Controller {
private readonly IViewsBackgroundCompilation _viewsBackgroundCompilation;
private readonly ShellSettings _shellSettings;
private readonly INotifier _notifier;
private readonly ISetupService _setupService;
private const string DefaultRecipe = "Default";
@@ -24,8 +25,10 @@ namespace Orchard.Setup.Controllers {
public SetupController(
INotifier notifier,
ISetupService setupService,
IViewsBackgroundCompilation viewsBackgroundCompilation) {
IViewsBackgroundCompilation viewsBackgroundCompilation,
ShellSettings shellSettings) {
_viewsBackgroundCompilation = viewsBackgroundCompilation;
_shellSettings = shellSettings;
_notifier = notifier;
_setupService = setupService;
@@ -127,7 +130,7 @@ namespace Orchard.Setup.Controllers {
_viewsBackgroundCompilation.Stop();
// redirect to the welcome page.
return Redirect("~/");
return Redirect("~/" + _shellSettings.RequestUrlPrefix);
} catch (Exception ex) {
Logger.Error(ex, "Setup failed");
_notifier.Error(T("Setup failed: {0}", ex.Message));

2
src/Orchard/Environment/RunningShellTable.cs
View File

@@ -93,7 +93,7 @@ namespace Orchard.Environment {
.Where(group => host.EndsWith(group.Key, StringComparison.OrdinalIgnoreCase))
.SelectMany(group => group
.OrderByDescending(settings => (settings.RequestUrlPrefix ?? string.Empty).Length))
.FirstOrDefault(settings => settings.State.CurrentState != TenantState.State.Disabled && appRelativePath.StartsWith(settings.RequestUrlPrefix ?? string.Empty, StringComparison.OrdinalIgnoreCase));
.FirstOrDefault(settings => settings.State.CurrentState != TenantState.State.Disabled && appRelativePath.StartsWith("~/" + (settings.RequestUrlPrefix ?? string.Empty), StringComparison.OrdinalIgnoreCase));
return mostQualifiedMatch ?? _fallback;
}