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

Merge branch 'dev-v7.6' into temp-u4-9201

Browse Source
This commit is contained in:
Stephan
2016-11-23 11:56:53 +01:00
parent ef409298e8 5784ea96e7
commit 3300dbbe5e
23 changed files with 62 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Core/Security/BackOfficeUserStore.cs
View File

@@ -644,6 +644,13 @@ namespace Umbraco.Core.Security
{
anythingChanged = true;
user.IsLockedOut = identityUser.IsLockedOut;
if (user.IsLockedOut)
{
//need to set the last lockout date
user.LastLockoutDate = DateTime.Now;
}
}
if (user.Username != identityUser.UserName && identityUser.UserName.IsNullOrWhiteSpace() == false)
{

6
src/Umbraco.Core/Services/ContentTypeService.cs
View File

@@ -141,7 +141,7 @@ namespace Umbraco.Core.Services
{
var evtMsgs = EventMessagesFactory.Get();
if (container.ContainedObjectType != containerObjectType)
if (container.ContainerObjectType != containerObjectType)
{
var ex = new InvalidOperationException("Not a " + objectTypeName + " container.");
return OperationStatus.Exception(evtMsgs, ex);
@@ -799,7 +799,7 @@ namespace Umbraco.Core.Services
// of a different type, move them to the recycle bin, then permanently delete the content items.
// The main problem with this is that for every content item being deleted, events are raised...
// which we need for many things like keeping caches in sync, but we can surely do this MUCH better.
var deletedContentTypes = new List<IContentType>() {contentType};
deletedContentTypes.AddRange(contentType.Descendants().OfType<IContentType>());
@@ -807,7 +807,7 @@ namespace Umbraco.Core.Services
{
_contentService.DeleteContentOfType(deletedContentType.Id);
}
repository.Delete(contentType);
uow.Commit();