Some more work on the MT UI

- tenant database setup can be preconfigured
- site setup UI reflects available settings (e.g. if database setup is preconfigured then don't show db options)
- updated jQuery from 1.4.1 to 1.4.2 (finally)

--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-05-10 16:01:04 -07:00
parent 6187110957
commit fa6ac5f0dd
23 changed files with 6503 additions and 6286 deletions

View File

@@ -1,5 +1,8 @@
namespace Orchard.Setup.Services {
using Orchard.Environment.Configuration;
namespace Orchard.Setup.Services {
public interface ISetupService : IDependency {
ShellSettings Prime();
void Setup(SetupContext context);
}
}

View File

@@ -44,11 +44,17 @@ namespace Orchard.Setup.Services {
private Localizer T { get; set; }
public ShellSettings Prime() {
return _shellSettings;
}
public void Setup(SetupContext context) {
var shellSettings = new ShellSettings(_shellSettings) {
DataProvider = context.DatabaseProvider,
DataConnectionString = context.DatabaseConnectionString,
DataTablePrefix = context.DatabaseTablePrefix,
var shellSettings = new ShellSettings(_shellSettings);
if (string.IsNullOrEmpty(shellSettings.DataProvider)) {
shellSettings.DataProvider = context.DatabaseProvider;
shellSettings.DataConnectionString = context.DatabaseConnectionString;
shellSettings.DataTablePrefix = context.DatabaseTablePrefix;
};
var shellDescriptor = new ShellDescriptor {