From fb87c02273cdee77d65d7c3d64fd79a1c0e012b8 Mon Sep 17 00:00:00 2001 From: Suha Can Date: Thu, 22 Apr 2010 11:23:18 -0700 Subject: [PATCH] - Adding some switches for host/urlprefix to the multi-tenancy command handler. - Moving connection string (for SQL) to be a switch instead of arg. - Refining output text from multi-tenancy commands, adding better help text. --HG-- branch : dev --- .../Commands/TenantCommand.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs index 8c68351ee..a988baf89 100644 --- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs +++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Commands/TenantCommand.cs @@ -10,6 +10,15 @@ namespace Orchard.MultiTenancy.Commands { _tenantService = tenantService; } + [OrchardSwitch] + public string Host { get; set; } + + [OrchardSwitch] + public string UrlPrefix { get; set; } + + [OrchardSwitch] + public string ConnectionString { get; set; } + [CommandHelp("tenant list: Display current tenants of a site")] [CommandName("tenant list")] public void List() { @@ -18,7 +27,6 @@ namespace Orchard.MultiTenancy.Commands { var tenants = _tenantService.GetTenants(); foreach (var tenant in tenants) { - Context.Output.WriteLine(T("---------------------------")); Context.Output.WriteLine(T("Name: ") + tenant.Name); Context.Output.WriteLine(T("Provider: ") + tenant.DataProvider); Context.Output.WriteLine(T("ConnectionString: ") + tenant.DataConnectionString); @@ -27,15 +35,16 @@ namespace Orchard.MultiTenancy.Commands { } } - [CommandHelp("tenant add : create new tenant named on the site")] + [CommandHelp("tenant add /ConnectionString: /Host: /UrlPrefix:" + + ": create new tenant named on the site")] [CommandName("tenant add")] - public void Create(string tenantName, string providerName, string connectionString, string prefix) { + public void Create(string tenantName, string providerName, string prefix) { Context.Output.WriteLine(T("Creating tenant")); _tenantService.CreateTenant( new ShellSettings { Name = tenantName, DataProvider = providerName, - DataConnectionString = connectionString, + DataConnectionString = ConnectionString, DataPrefix = prefix }); }