yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds IsUpgrading method to ApplicationContext and fixes AppBuilderExtensions checks since we need a user manager when upgrading

Browse Source
This commit is contained in:
Shannon
2015-04-01 16:12:32 +11:00
parent df6bb36876
commit a43847bc8b
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/ApplicationContext.cs
View File

@@ -202,6 +202,14 @@ namespace Umbraco.Core
}
}
/// <summary>
/// If the db is configured and there is a database context, but we are not 'configured' , then it means we are upgrading
/// </summary>
public bool IsUpgrading
{
get { return IsConfigured == false && DatabaseContext != null && DatabaseContext.IsDatabaseConfigured; }
}
/// <summary>
/// The original/first url that the web application executes
/// </summary>

3
src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
View File

@@ -39,8 +39,7 @@ namespace Umbraco.Web
""application"": {
""applicationPath"": """ + html.ViewContext.HttpContext.Request.ApplicationPath + @"""
},
//""isDebuggingEnabled"" : " + html.ViewContext.HttpContext.IsDebuggingEnabled.ToString().ToLowerInvariant() + @"
""isDebuggingEnabled"" : false
""isDebuggingEnabled"" : " + html.ViewContext.HttpContext.IsDebuggingEnabled.ToString().ToLowerInvariant() + @"
};
</script>";

12
src/Umbraco.Web/Security/Identity/AppBuilderExtensions.cs
View File

@@ -36,9 +36,7 @@ namespace Umbraco.Web.Security.Identity
if (userMembershipProvider == null) throw new ArgumentNullException("userMembershipProvider");
//Don't proceed if the app is not ready
if (appContext.IsConfigured == false
|| appContext.DatabaseContext == null
|| appContext.DatabaseContext.IsDatabaseConfigured == false) return;
if (appContext.IsUpgrading == false && appContext.IsConfigured == false) return;
//Configure Umbraco user manager to be created per request
app.CreatePerOwinContext<BackOfficeUserManager>(
@@ -66,9 +64,7 @@ namespace Umbraco.Web.Security.Identity
if (customUserStore == null) throw new ArgumentNullException("customUserStore");
//Don't proceed if the app is not ready
if (appContext.IsConfigured == false
|| appContext.DatabaseContext == null
|| appContext.DatabaseContext.IsDatabaseConfigured == false) return;
if (appContext.IsUpgrading == false && appContext.IsConfigured == false) return;
//Configure Umbraco user manager to be created per request
app.CreatePerOwinContext<BackOfficeUserManager>(
@@ -94,9 +90,7 @@ namespace Umbraco.Web.Security.Identity
if (userManager == null) throw new ArgumentNullException("userManager");
//Don't proceed if the app is not ready
if (appContext.IsConfigured == false
|| appContext.DatabaseContext == null
|| appContext.DatabaseContext.IsDatabaseConfigured == false) return;
if (appContext.IsUpgrading == false && appContext.IsConfigured == false) return;
//Configure Umbraco user manager to be created per request
app.CreatePerOwinContext<TManager>(userManager);