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

Merge pull request #11148 from umbraco/v9/bugfix/11083-nested_content_missing_properties_on_member_edit

Browse Source 
V9/bugfix/11083 nested content missing properties on member edit
This commit is contained in:
Bjarke Berg
2021-09-21 14:14:57 +02:00
committed by GitHub
parent 6c1ced201f a7d60badd3
commit e84f4b29e5
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.BackOffice/PropertyEditors/NestedContentController.cs
View File

@@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Mvc;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Web.BackOffice.Controllers;
using Umbraco.Cms.Web.Common.Attributes;
@@ -23,9 +24,7 @@ namespace Umbraco.Cms.Web.BackOffice.PropertyEditors
}
[HttpGet]
public IEnumerable<object> GetContentTypes()
{
return _contentTypeService
public IEnumerable<object> GetContentTypes() => _contentTypeService
.GetAllElementTypes()
.OrderBy(x => x.SortOrder)
.Select(x => new
@@ -35,8 +34,7 @@ namespace Umbraco.Cms.Web.BackOffice.PropertyEditors
name = x.Name,
alias = x.Alias,
icon = x.Icon,
tabs = x.CompositionPropertyGroups.Select(y => y.Name).Distinct()
tabs = x.CompositionPropertyGroups.Where(x => x.Type == PropertyGroupType.Group && x.GetParentAlias() is null).Select(y => y.Name).Distinct()
});
}
}
}

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
View File

@@ -535,7 +535,7 @@
// remove all tabs except the specified tab
var tabs = scaffold.variants[0].tabs;
var tab = _.find(tabs, function (tab) {
return tab.id !== 0 && (tab.alias.toLowerCase() === contentType.ncTabAlias.toLowerCase() || contentType.ncTabAlias === "");
return tab.id !== 0 && (tab.label.toLowerCase() === contentType.ncTabAlias.toLowerCase() || contentType.ncTabAlias === "");
});
scaffold.variants[0].tabs = [];
if (tab) {