From 1fa348b6b6c9debb04b4639a0fa681eb2ee3d698 Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Thu, 22 Apr 2010 16:06:07 -0700 Subject: [PATCH] Adding request url data to settings struct and making name of prefix more specific --HG-- branch : dev --- .../Environment/DefaultCompositionStrategyTests.cs | 2 +- src/Orchard.Tests/Mvc/Routes/ShellRouteTests.cs | 4 +++- .../Orchard.MultiTenancy/Commands/TenantCommand.cs | 6 +++--- .../Orchard.MultiTenancy/Controllers/AdminController.cs | 2 +- .../Modules/Orchard.MultiTenancy/Views/Admin/List.ascx | 2 +- src/Orchard/Environment/Configuration/ShellSettings.cs | 6 +++++- .../Environment/Configuration/ShellSettingsManager.cs | 4 ++-- src/Orchard/Environment/Topology/CompositionStrategy.cs | 8 ++++---- 8 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs b/src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs index dc964d96f..e25e5632f 100644 --- a/src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs +++ b/src/Orchard.Tests/Environment/DefaultCompositionStrategyTests.cs @@ -263,7 +263,7 @@ namespace Orchard.Tests.Environment { [Test] public void DataPrefixChangesTableName() { var settings = BuildDefaultSettings(); - settings.DataPrefix = "Yadda"; + settings.DataTablePrefix = "Yadda"; var descriptor = Build.TopologyDescriptor().WithFeatures("Foo Plus", "Bar", "Bar Minus"); _extensionDescriptors = new[] { diff --git a/src/Orchard.Tests/Mvc/Routes/ShellRouteTests.cs b/src/Orchard.Tests/Mvc/Routes/ShellRouteTests.cs index a74b3f7c2..0eb826af8 100644 --- a/src/Orchard.Tests/Mvc/Routes/ShellRouteTests.cs +++ b/src/Orchard.Tests/Mvc/Routes/ShellRouteTests.cs @@ -11,6 +11,7 @@ using Orchard.Environment; using Orchard.Environment.Configuration; using Orchard.Mvc.Routes; using Orchard.Tests.Stubs; +using Orchard.Tests.Utility; namespace Orchard.Tests.Mvc.Routes { [TestFixture] @@ -27,6 +28,7 @@ namespace Orchard.Tests.Mvc.Routes { var settings = new ShellSettings { Name = "Alpha" }; var builder = new ContainerBuilder(); builder.RegisterType().InstancePerDependency(); + builder.RegisterAutoMocking(); builder.Register(ctx => settings); var container = builder.Build(); @@ -51,7 +53,7 @@ namespace Orchard.Tests.Mvc.Routes { private void Init() { _settingsA = new ShellSettings {Name = "Alpha"}; - _settingsB = new ShellSettings {Name = "Beta"}; + _settingsB = new ShellSettings {Name = "Beta", }; _routes = new RouteCollection(); var rootBuilder = new ContainerBuilder(); diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs index bddfdb722..a6673c857 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs @@ -31,7 +31,7 @@ namespace Orchard.MultiTenancy.Commands { Context.Output.WriteLine(T("Name: ") + tenant.Name); Context.Output.WriteLine(T("Provider: ") + tenant.DataProvider); Context.Output.WriteLine(T("ConnectionString: ") + tenant.DataConnectionString); - Context.Output.WriteLine(T("Prefix: ") + tenant.DataPrefix); + Context.Output.WriteLine(T("Prefix: ") + tenant.DataTablePrefix); Context.Output.WriteLine(T("---------------------------")); } } @@ -46,7 +46,7 @@ namespace Orchard.MultiTenancy.Commands { Name = tenantName, DataProvider = providerName, DataConnectionString = ConnectionString, - DataPrefix = prefix + DataTablePrefix = prefix }); } @@ -64,7 +64,7 @@ namespace Orchard.MultiTenancy.Commands { Context.Output.WriteLine(T("Name: ") + tenant.Name); Context.Output.WriteLine(T("Provider: ") + tenant.DataProvider); Context.Output.WriteLine(T("ConnectionString: ") + tenant.DataConnectionString); - Context.Output.WriteLine(T("Prefix: ") + tenant.DataPrefix); + Context.Output.WriteLine(T("Prefix: ") + tenant.DataTablePrefix); Context.Output.WriteLine(T("---------------------------")); } } diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs index f30849e86..401c850f3 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs @@ -42,7 +42,7 @@ namespace Orchard.MultiTenancy.Controllers { Name = viewModel.Name, DataProvider = viewModel.DataProvider, DataConnectionString = viewModel.ConnectionString, - DataPrefix = viewModel.Prefix + DataTablePrefix = viewModel.Prefix }); return RedirectToAction("List"); diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/List.ascx b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/List.ascx index e6533c341..4b6c61edc 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/List.ascx +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/List.ascx @@ -24,7 +24,7 @@ <%= tenant.Name %> <%= tenant.DataProvider %> <%= tenant.DataConnectionString %> - <%= tenant.DataPrefix %> + <%= tenant.DataTablePrefix %> <% } %> diff --git a/src/Orchard/Environment/Configuration/ShellSettings.cs b/src/Orchard/Environment/Configuration/ShellSettings.cs index 7631d2ce0..d730ec21c 100644 --- a/src/Orchard/Environment/Configuration/ShellSettings.cs +++ b/src/Orchard/Environment/Configuration/ShellSettings.cs @@ -6,8 +6,12 @@ /// public class ShellSettings { public string Name { get; set; } + public string DataProvider { get; set; } public string DataConnectionString { get; set; } - public string DataPrefix { get; set; } + public string DataTablePrefix { get; set; } + + public string RequestUrlHost { get; set; } + public string RequestUrlPrefix { get; set; } } } diff --git a/src/Orchard/Environment/Configuration/ShellSettingsManager.cs b/src/Orchard/Environment/Configuration/ShellSettingsManager.cs index 1072d342a..c53119384 100644 --- a/src/Orchard/Environment/Configuration/ShellSettingsManager.cs +++ b/src/Orchard/Environment/Configuration/ShellSettingsManager.cs @@ -59,7 +59,7 @@ namespace Orchard.Environment.Configuration { Name = content.Name, DataProvider = content.DataProvider, DataConnectionString = content.DataConnectionString, - DataPrefix = content.DataPrefix, + DataTablePrefix = content.DataPrefix, }; } @@ -72,7 +72,7 @@ namespace Orchard.Environment.Configuration { Name = settings.Name, DataProvider = settings.DataProvider, DataConnectionString = settings.DataConnectionString, - DataPrefix = settings.DataPrefix, + DataPrefix = settings.DataTablePrefix, }); } } diff --git a/src/Orchard/Environment/Topology/CompositionStrategy.cs b/src/Orchard/Environment/Topology/CompositionStrategy.cs index c7f7f85ba..d50313f7f 100644 --- a/src/Orchard/Environment/Topology/CompositionStrategy.cs +++ b/src/Orchard/Environment/Topology/CompositionStrategy.cs @@ -134,14 +134,14 @@ namespace Orchard.Environment.Topology { var extensionDescriptor = feature.Descriptor.Extension; var extensionName = extensionDescriptor.Name.Replace('.', '_'); - var dataPrefix = ""; - if (!string.IsNullOrEmpty(settings.DataPrefix)) - dataPrefix = settings.DataPrefix + "_"; + var dataTablePrefix = ""; + if (!string.IsNullOrEmpty(settings.DataTablePrefix)) + dataTablePrefix = settings.DataTablePrefix + "_"; return new RecordTopology { Type = type, Feature = feature, - TableName = dataPrefix + extensionName + '_' + type.Name, + TableName = dataTablePrefix + extensionName + '_' + type.Name, }; } }