lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

#18096: Fixing Setup command

Browse Source 
Work Item: 18096

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-12-28 15:10:00 -08:00
parent 9056aac66a
commit f3b8003b4a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+3 -2
View File
@@ -67,8 +67,8 @@ namespace Orchard.Setup.Services {
public string Setup(SetupContext context) { public string Setup(SetupContext context) {
string executionId = null; string executionId = null;
// The vanilla Orchard distibution has the following features enabled. // The vanilla Orchard distibution has the following features enabled.
if (context.EnabledFeatures == null || context.EnabledFeatures.Count() == 0) {
string[] hardcoded = { string[] hardcoded = {
// Framework // Framework
"Orchard.Framework", "Orchard.Framework",
@@ -79,7 +79,8 @@ namespace Orchard.Setup.Services {
"PackagingServices", "Orchard.Packaging", "Gallery", "Orchard.Recipes", "PackagingServices", "Orchard.Packaging", "Gallery", "Orchard.Recipes",
}; };
context.EnabledFeatures = hardcoded; if (context.EnabledFeatures != null) {
context.EnabledFeatures = hardcoded.Union(context.EnabledFeatures).Distinct();
} }
var shellSettings = new ShellSettings(_shellSettings); var shellSettings = new ShellSettings(_shellSettings);
src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
+1 -1
View File
@@ -62,7 +62,7 @@ namespace Orchard.Setup {
builder.RegisterType<DataServicesProviderFactory>().As<IDataServicesProviderFactory>().InstancePerLifetimeScope(); builder.RegisterType<DataServicesProviderFactory>().As<IDataServicesProviderFactory>().InstancePerLifetimeScope();
builder.RegisterType<DefaultCommandManager>().As<ICommandManager>().InstancePerLifetimeScope(); builder.RegisterType<DefaultCommandManager>().As<ICommandManager>().InstancePerLifetimeScope();
builder.RegisterType<HelpCommand>().As<ICommandHandler>().InstancePerLifetimeScope(); builder.RegisterType<HelpCommand>().As<ICommandHandler>().InstancePerLifetimeScope();
builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell"); //builder.RegisterType<WorkContextAccessor>().As<IWorkContextAccessor>().InstancePerMatchingLifetimeScope("shell");
builder.RegisterType<ResourceManager>().As<IResourceManager>().InstancePerLifetimeScope(); builder.RegisterType<ResourceManager>().As<IResourceManager>().InstancePerLifetimeScope();
builder.RegisterType<ResourceFilter>().As<IFilterProvider>().InstancePerLifetimeScope(); builder.RegisterType<ResourceFilter>().As<IFilterProvider>().InstancePerLifetimeScope();
builder.RegisterType<DefaultOrchardShell>().As<IOrchardShell>().InstancePerMatchingLifetimeScope("shell"); builder.RegisterType<DefaultOrchardShell>().As<IOrchardShell>().InstancePerMatchingLifetimeScope("shell");