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

Merge branch 'netcore/members-passwordchange-temp' into netcore/members-roles-save

Browse Source
This commit is contained in:
Emma Garland
2021-03-12 14:39:24 +00:00
parent 216d6349d9 aa4947913e
commit 8ed67aa14a
363 changed files with 4820 additions and 2115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Models/Mapping/ContentTypeMapDefinition.cs
View File

@@ -592,7 +592,7 @@ namespace Umbraco.Cms.Core.Models.Mapping
return Enumerable.Empty<string>();
var aliases = new List<string>();
var ancestorIds = parent.Path.Split(',').Select(int.Parse);
var ancestorIds = parent.Path.Split(Constants.CharArrays.Comma).Select(int.Parse);
// loop through all content types and return ordered aliases of ancestors
var allContentTypes = _contentTypeService.GetAll().ToArray();
foreach (var ancestorId in ancestorIds)

8
src/Umbraco.Core/Models/Mapping/UserMapDefinition.cs
View File

@@ -282,8 +282,8 @@ namespace Umbraco.Cms.Core.Models.Mapping
{
target.AvailableCultures = _textService.GetSupportedCultures().ToDictionary(x => x.Name, x => x.DisplayName);
target.Avatars = source.GetUserAvatarUrls(_appCaches.RuntimeCache, _mediaFileSystem, _imageUrlGenerator);
target.CalculatedStartContentIds = GetStartNodes(source.CalculateContentStartNodeIds(_entityService), UmbracoObjectTypes.Document, "content/contentRoot", context);
target.CalculatedStartMediaIds = GetStartNodes(source.CalculateMediaStartNodeIds(_entityService), UmbracoObjectTypes.Media, "media/mediaRoot", context);
target.CalculatedStartContentIds = GetStartNodes(source.CalculateContentStartNodeIds(_entityService, _appCaches), UmbracoObjectTypes.Document, "content/contentRoot", context);
target.CalculatedStartMediaIds = GetStartNodes(source.CalculateMediaStartNodeIds(_entityService, _appCaches), UmbracoObjectTypes.Media, "media/mediaRoot", context);
target.CreateDate = source.CreateDate;
target.Culture = source.GetUserCulture(_textService, _globalSettings).ToString();
target.Email = source.Email;
@@ -336,8 +336,8 @@ namespace Umbraco.Cms.Core.Models.Mapping
target.Email = source.Email;
target.EmailHash = source.Email.ToLowerInvariant().Trim().GenerateHash();
target.Name = source.Name;
target.StartContentIds = source.CalculateContentStartNodeIds(_entityService);
target.StartMediaIds = source.CalculateMediaStartNodeIds(_entityService);
target.StartContentIds = source.CalculateContentStartNodeIds(_entityService, _appCaches);
target.StartMediaIds = source.CalculateMediaStartNodeIds(_entityService, _appCaches);
target.UserId = source.Id;
//we need to map the legacy UserType