From 9a042fbbdf5c785356572c1a239f4c4cc63007c3 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 3 Mar 2015 19:40:37 +1100 Subject: [PATCH] Removes the assignment of the DefaultPermissions property since this is auto assigned in the ctor (and should be assignable) --- src/Umbraco.Core/Persistence/Factories/UserFactory.cs | 4 +--- src/Umbraco.Web/Security/WebSecurity.cs | 1 - src/umbraco.businesslogic/UserType.cs | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Core/Persistence/Factories/UserFactory.cs b/src/Umbraco.Core/Persistence/Factories/UserFactory.cs index 305c630a71..1c3ad314e5 100644 --- a/src/Umbraco.Core/Persistence/Factories/UserFactory.cs +++ b/src/Umbraco.Core/Persistence/Factories/UserFactory.cs @@ -32,9 +32,7 @@ namespace Umbraco.Core.Persistence.Factories IsLockedOut = dto.NoConsole, IsApproved = dto.Disabled == false, Email = dto.Email, - Language = dto.UserLanguage, - //NOTE: The default permission come from the user type's default permissions - DefaultPermissions = _userType.Permissions + Language = dto.UserLanguage }; foreach (var app in dto.User2AppDtos) diff --git a/src/Umbraco.Web/Security/WebSecurity.cs b/src/Umbraco.Web/Security/WebSecurity.cs index 5239207316..5896a3f05b 100644 --- a/src/Umbraco.Web/Security/WebSecurity.cs +++ b/src/Umbraco.Web/Security/WebSecurity.cs @@ -222,7 +222,6 @@ namespace Umbraco.Web.Security Language = GlobalSettings.DefaultUILanguage, Name = membershipUser.UserName, RawPasswordValue = Guid.NewGuid().ToString("N"), //Need to set this to something - will not be used though - DefaultPermissions = writer.Permissions, Username = membershipUser.UserName, StartContentId = -1, StartMediaId = -1, diff --git a/src/umbraco.businesslogic/UserType.cs b/src/umbraco.businesslogic/UserType.cs index 31604c3ce9..297695761e 100644 --- a/src/umbraco.businesslogic/UserType.cs +++ b/src/umbraco.businesslogic/UserType.cs @@ -122,7 +122,7 @@ namespace umbraco.BusinessLogic /// public string DefaultPermissions { - get { return string.Join("", UserTypeItem.Permissions); } + get { return UserTypeItem.Permissions == null ? string.Empty : string.Join("", UserTypeItem.Permissions); } set { UserTypeItem.Permissions = value.ToCharArray().Select(x => x.ToString(CultureInfo.InvariantCulture)); } }