From 6d9190bdb3bcae2e8aede3a3640744a5664af294 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 26 Jul 2017 17:24:26 +1000 Subject: [PATCH] ensures all built in groups have -1 as start nodes for media, fixes automapper tests --- .../TargetVersionSevenSevenZero/AddUserGroupTables.cs | 4 ++++ src/Umbraco.Web/Models/Mapping/UserModelMapper.cs | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs index 60865afbfd..d1cf0a40d9 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs @@ -99,9 +99,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenSevenZe //Ensure all built in groups have a start node of -1 Execute.Sql("UPDATE umbracoUserGroup SET startContentId = -1 WHERE userGroupAlias = 'editor'"); + Execute.Sql("UPDATE umbracoUserGroup SET startMediaId = -1 WHERE userGroupAlias = 'editor'"); Execute.Sql("UPDATE umbracoUserGroup SET startContentId = -1 WHERE userGroupAlias = 'writer'"); + Execute.Sql("UPDATE umbracoUserGroup SET startMediaId = -1 WHERE userGroupAlias = 'writer'"); Execute.Sql("UPDATE umbracoUserGroup SET startContentId = -1 WHERE userGroupAlias = 'translator'"); + Execute.Sql("UPDATE umbracoUserGroup SET startMediaId = -1 WHERE userGroupAlias = 'translator'"); Execute.Sql("UPDATE umbracoUserGroup SET startContentId = -1 WHERE userGroupAlias = 'admin'"); + Execute.Sql("UPDATE umbracoUserGroup SET startMediaId = -1 WHERE userGroupAlias = 'admin'"); } private void MigrateUserPermissions() diff --git a/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs b/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs index 6dcd88eae4..f9379d7407 100644 --- a/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs +++ b/src/Umbraco.Web/Models/Mapping/UserModelMapper.cs @@ -44,6 +44,7 @@ namespace Umbraco.Web.Models.Mapping .ForMember(dest => dest.Id, map => map.Condition(source => GetIntId(source.Id) > 0)) .ForMember(detail => detail.SessionTimeout, opt => opt.Ignore()) .ForMember(detail => detail.EmailConfirmedDate, opt => opt.Ignore()) + .ForMember(detail => detail.UserType, opt => opt.Ignore()) .ForMember(detail => detail.InvitedDate, opt => opt.Ignore()) .ForMember(detail => detail.SecurityStamp, opt => opt.Ignore()) .ForMember(detail => detail.Avatar, opt => opt.Ignore()) @@ -74,6 +75,7 @@ namespace Umbraco.Web.Models.Mapping .ForMember(detail => detail.Id, opt => opt.Ignore()) .ForMember(detail => detail.StartContentIds, opt => opt.Ignore()) .ForMember(detail => detail.StartMediaIds, opt => opt.Ignore()) + .ForMember(detail => detail.UserType, opt => opt.Ignore()) .ForMember(detail => detail.Language, opt => opt.Ignore()) .ForMember(detail => detail.Username, opt => opt.Ignore()) .ForMember(detail => detail.PasswordQuestion, opt => opt.Ignore())