AB4234 - Fixes namespaces and removed old unused property on user
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Core.Composing;
|
||||
using Umbraco.Core.Configuration.UmbracoSettings;
|
||||
using Umbraco.Core.Configuration.UmbracoSettings;
|
||||
|
||||
namespace Umbraco.Web.Composing.CompositionExtensions
|
||||
namespace Umbraco.Core.Composing.CompositionExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Compose configurations.
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Core.Composing;
|
||||
using Umbraco.Core.Mapping;
|
||||
using Umbraco.Core.Mapping;
|
||||
|
||||
namespace Umbraco.Web.Composing.CompositionExtensions
|
||||
namespace Umbraco.Core.Composing.CompositionExtensions
|
||||
|
||||
{
|
||||
public static class CoreMappingProfiles
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
using Umbraco.Core.Composing;
|
||||
using Umbraco.Web.Composing;
|
||||
using Umbraco.Core.Configuration;
|
||||
using Umbraco.Core.Configuration;
|
||||
using Umbraco.Core.IO;
|
||||
using Umbraco.Core.IO.MediaPathSchemes;
|
||||
using Umbraco.Core.Logging;
|
||||
using Umbraco.Core;
|
||||
|
||||
namespace Umbraco.Web.Composing.CompositionExtensions
|
||||
namespace Umbraco.Core.Composing.CompositionExtensions
|
||||
{
|
||||
internal static class FileSystems
|
||||
{
|
||||
|
||||
@@ -1,9 +1,7 @@
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Core.Composing;
|
||||
using Umbraco.Core.Persistence.Repositories;
|
||||
using Umbraco.Core.Persistence.Repositories;
|
||||
using Umbraco.Core.Persistence.Repositories.Implement;
|
||||
|
||||
namespace Umbraco.Web.Composing.CompositionExtensions
|
||||
namespace Umbraco.Core.Composing.CompositionExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Composes repositories.
|
||||
|
||||
@@ -1,11 +1,8 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Core.Cache;
|
||||
using Umbraco.Core.Composing;
|
||||
using Umbraco.Core.Configuration;
|
||||
using Umbraco.Core.Dictionary;
|
||||
using Umbraco.Core.Events;
|
||||
using Umbraco.Core.IO;
|
||||
using Umbraco.Core.Logging;
|
||||
@@ -13,7 +10,7 @@ using Umbraco.Core.Packaging;
|
||||
using Umbraco.Core.Services;
|
||||
using Umbraco.Core.Services.Implement;
|
||||
|
||||
namespace Umbraco.Web.Composing.CompositionExtensions
|
||||
namespace Umbraco.Core.Composing.CompositionExtensions
|
||||
{
|
||||
internal static class Services
|
||||
{
|
||||
|
||||
@@ -321,13 +321,6 @@ namespace Umbraco.Core.Models.Membership
|
||||
set => SetPropertyValueAndDetectChanges(value, ref _language, nameof(Language));
|
||||
}
|
||||
|
||||
[IgnoreDataMember]
|
||||
public bool DefaultToLiveEditing
|
||||
{
|
||||
get => _defaultToLiveEditing;
|
||||
set => SetPropertyValueAndDetectChanges(value, ref _defaultToLiveEditing, nameof(DefaultToLiveEditing));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets the groups that user is part of
|
||||
/// </summary>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using System;
|
||||
using Umbraco.Core.Cache;
|
||||
using Umbraco.Core.Composing;
|
||||
using Umbraco.Web.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Configuration;
|
||||
using Umbraco.Core.Configuration.UmbracoSettings;
|
||||
using Umbraco.Core.Hosting;
|
||||
|
||||
@@ -115,7 +115,6 @@ namespace Umbraco.Core.Services.Implement
|
||||
|
||||
user = new User(_globalSettings)
|
||||
{
|
||||
DefaultToLiveEditing = false,
|
||||
Email = email,
|
||||
Language = _globalSettings.DefaultUILanguage,
|
||||
Name = username,
|
||||
|
||||
@@ -13,7 +13,7 @@ using Umbraco.Core.Logging;
|
||||
using Umbraco.Core.Services;
|
||||
using Umbraco.Tests.Components;
|
||||
using Umbraco.Tests.TestHelpers;
|
||||
using Umbraco.Web.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Composing.CompositionExtensions;
|
||||
using Current = Umbraco.Web.Composing.Current;
|
||||
using FileSystems = Umbraco.Core.IO.FileSystems;
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ using System.Linq;
|
||||
using Moq;
|
||||
using NUnit.Framework;
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Web.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Configuration.UmbracoSettings;
|
||||
using Umbraco.Core.Logging;
|
||||
using Umbraco.Core.Models;
|
||||
|
||||
@@ -10,16 +10,14 @@ using Umbraco.Core;
|
||||
using NUnit.Framework;
|
||||
using Umbraco.Core.Cache;
|
||||
using Umbraco.Core.Composing;
|
||||
using Umbraco.Web.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Configuration.UmbracoSettings;
|
||||
using Umbraco.Core.Logging;
|
||||
using Umbraco.Core.Models;
|
||||
using Umbraco.Core.Models.Entities;
|
||||
using Umbraco.Core.PropertyEditors;
|
||||
using Umbraco.Core.Serialization;
|
||||
using Umbraco.Core.Services;
|
||||
using Umbraco.Core.Services.Implement;
|
||||
using Umbraco.Tests.TestHelpers;
|
||||
using Umbraco.Tests.TestHelpers.Entities;
|
||||
using Umbraco.Tests.TestHelpers.Stubs;
|
||||
using Umbraco.Tests.Testing;
|
||||
|
||||
@@ -3,7 +3,6 @@ using System.Linq;
|
||||
using Moq;
|
||||
using NUnit.Framework;
|
||||
using Umbraco.Core;
|
||||
using Umbraco.Web.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Configuration.UmbracoSettings;
|
||||
using Umbraco.Core.Services;
|
||||
using Umbraco.Core.Logging;
|
||||
@@ -17,6 +16,7 @@ using Umbraco.Web.Models.ContentEditing;
|
||||
using Umbraco.Tests.Testing;
|
||||
using Umbraco.Web.PropertyEditors;
|
||||
using Current = Umbraco.Web.Composing.Current;
|
||||
using Umbraco.Core.Composing.CompositionExtensions;
|
||||
|
||||
namespace Umbraco.Tests.Models.Mapping
|
||||
{
|
||||
|
||||
@@ -27,7 +27,6 @@ namespace Umbraco.Tests.Models
|
||||
CreateDate = DateTime.Now,
|
||||
Name = "Test",
|
||||
Comments = "comments",
|
||||
DefaultToLiveEditing = false,
|
||||
Email = "test@test.com",
|
||||
Language = "en",
|
||||
FailedPasswordAttempts = 3,
|
||||
@@ -69,7 +68,6 @@ namespace Umbraco.Tests.Models
|
||||
CreateDate = DateTime.Now,
|
||||
Name = "Test",
|
||||
Comments = "comments",
|
||||
DefaultToLiveEditing = false,
|
||||
Email = "test@test.com",
|
||||
Language = "en",
|
||||
FailedPasswordAttempts = 3,
|
||||
|
||||
@@ -16,8 +16,7 @@ using Umbraco.Core.Services;
|
||||
using Umbraco.Tests.Services;
|
||||
using Umbraco.Tests.Services.Importing;
|
||||
using Umbraco.Tests.Testing;
|
||||
using Umbraco.Web.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Configuration;
|
||||
using Umbraco.Core.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Strings;
|
||||
|
||||
namespace Umbraco.Tests.Packaging
|
||||
|
||||
@@ -8,7 +8,7 @@ using Umbraco.Web.Composing;
|
||||
using Umbraco.Core.IO;
|
||||
using Umbraco.Tests.TestHelpers;
|
||||
using Umbraco.Tests.Testing;
|
||||
using Umbraco.Web.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Logging;
|
||||
using FileSystems = Umbraco.Core.IO.FileSystems;
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@ using System.Collections.Generic;
|
||||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Threading;
|
||||
using System.Xml.Linq;
|
||||
using Examine;
|
||||
using Moq;
|
||||
@@ -38,12 +37,11 @@ using Umbraco.Web.Actions;
|
||||
using Umbraco.Web.ContentApps;
|
||||
using Umbraco.Web.PublishedCache;
|
||||
using Umbraco.Web.Routing;
|
||||
using Umbraco.Web.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Composing.CompositionExtensions;
|
||||
using Umbraco.Core.Hosting;
|
||||
using Umbraco.Core.Mapping;
|
||||
using Umbraco.Core.Serialization;
|
||||
using Umbraco.Web.Composing.CompositionExtensions;
|
||||
using Umbraco.Web.Composing;
|
||||
using Umbraco.Web.Hosting;
|
||||
using Umbraco.Web.Sections;
|
||||
using FileSystems = Umbraco.Core.IO.FileSystems;
|
||||
|
||||
@@ -81,7 +81,6 @@ namespace Umbraco.Core.Security
|
||||
|
||||
var userEntity = new User(_globalSettings, user.Name, user.Email, user.UserName, emptyPasswordValue)
|
||||
{
|
||||
DefaultToLiveEditing = false,
|
||||
Language = user.Culture ?? _globalSettings.DefaultUILanguage,
|
||||
StartContentIds = user.StartContentIds ?? new int[] { },
|
||||
StartMediaIds = user.StartMediaIds ?? new int[] { },
|
||||
|
||||
Reference in New Issue
Block a user