From 4bb71273e20a8752b64da0299d1f67ad80877e62 Mon Sep 17 00:00:00 2001 From: Shannon Date: Fri, 9 Aug 2013 16:00:09 +1000 Subject: [PATCH] doh, re-publicized EntityPermissions... caused test errors. --- .../Models/Membership/EntityPermission.cs | 23 +++++++++++++++++++ src/Umbraco.Core/Models/Membership/User.cs | 21 ----------------- 2 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 src/Umbraco.Core/Models/Membership/EntityPermission.cs diff --git a/src/Umbraco.Core/Models/Membership/EntityPermission.cs b/src/Umbraco.Core/Models/Membership/EntityPermission.cs new file mode 100644 index 0000000000..dcb7111f2d --- /dev/null +++ b/src/Umbraco.Core/Models/Membership/EntityPermission.cs @@ -0,0 +1,23 @@ +namespace Umbraco.Core.Models.Membership +{ + /// + /// Represents a user -> entity permission + /// + public class EntityPermission + { + public EntityPermission(object userId, int entityId, string[] assignedPermissions) + { + UserId = userId; + EntityId = entityId; + AssignedPermissions = assignedPermissions; + } + + public object UserId { get; set; } + public int EntityId { get; set; } + + /// + /// The assigned permissions for the user/entity combo + /// + public string[] AssignedPermissions { get; set; } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Models/Membership/User.cs b/src/Umbraco.Core/Models/Membership/User.cs index 0853ec243a..ddcc28cccb 100644 --- a/src/Umbraco.Core/Models/Membership/User.cs +++ b/src/Umbraco.Core/Models/Membership/User.cs @@ -7,27 +7,6 @@ using Umbraco.Core.Persistence.Mappers; namespace Umbraco.Core.Models.Membership { - /// - /// Represents a user -> entity permission - /// - internal class EntityPermission - { - public EntityPermission(object userId, int entityId, string[] assignedPermissions) - { - UserId = userId; - EntityId = entityId; - AssignedPermissions = assignedPermissions; - } - - public object UserId { get; set; } - public int EntityId { get; set; } - - /// - /// The assigned permissions for the user/entity combo - /// - public string[] AssignedPermissions { get; set; } - } - /// /// Represents a backoffice user ///