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

Modifying ISetupService::Setup to return an executionId.

Browse Source 
--HG--
branch : recipe
This commit is contained in:
Suha Can
2011-02-17 16:47:36 -08:00
parent 1f69312ba9
commit 06f5898d72
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,7 +105,7 @@ namespace Orchard.Setup.Controllers {
Recipe = model.Recipe
};
_setupService.Setup(setupContext);
string executionId = _setupService.Setup(setupContext);
// First time installation if finally done. Tell the background views compilation
// process to stop, so that it doesn't interfere with the user (asp.net compilation

2
src/Orchard.Web/Modules/Orchard.Setup/Services/ISetupService.cs
View File

@@ -6,6 +6,6 @@ namespace Orchard.Setup.Services {
public interface ISetupService : IDependency {
ShellSettings Prime();
IEnumerable<Recipe> Recipes();
void Setup(SetupContext context);
string Setup(SetupContext context);
}
}

14
src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
View File

@@ -72,7 +72,8 @@ namespace Orchard.Setup.Services {
return _recipes;
}
public void Setup(SetupContext context) {
public string Setup(SetupContext context) {
string executionId = null;
// The vanilla Orchard distibution has the following features enabled.
if (context.EnabledFeatures == null || context.EnabledFeatures.Count() == 0) {
string[] hardcoded = {
@@ -200,7 +201,7 @@ namespace Orchard.Setup.Services {
shellSettings.State = new TenantState("Running");
using (var environment = _orchardHost.CreateStandaloneEnvironment(shellSettings)) {
try {
CreateTenantData(context, environment);
executionId = CreateTenantData(context, environment);
}
catch {
environment.Resolve<ITransactionManager>().Cancel();
@@ -209,9 +210,12 @@ namespace Orchard.Setup.Services {
}
_shellSettingsManager.SaveSettings(shellSettings);
return executionId;
}
private void CreateTenantData(SetupContext context, IWorkContextScope environment) {
private string CreateTenantData(SetupContext context, IWorkContextScope environment) {
string executionId = null;
// create superuser
var membershipService = environment.Resolve<IMembershipService>();
var user =
@@ -242,7 +246,7 @@ namespace Orchard.Setup.Services {
var recipeManager = environment.Resolve<IRecipeManager>();
if (context.Recipe != null) {
recipeManager.Execute(Recipes().Where(r => r.Name == context.Recipe).FirstOrDefault());
executionId = recipeManager.Execute(Recipes().Where(r => r.Name == context.Recipe).FirstOrDefault());
}
var contentManager = environment.Resolve<IContentManager>();
@@ -325,6 +329,8 @@ Modules are created by other users of Orchard just like you so if you feel up to
if (HttpContext.Current != null) {
authenticationService.SignIn(user, true);
}
return executionId;
}
}
}