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

V8: Default nested content item names to the item type name (#5369)

Browse Source 
V8: Default nested content item names to the item type name
This commit is contained in:
Sebastiaan Janssen
2019-05-31 20:11:56 +02:00
committed by GitHub
parent 47a7c08686 2bdbd86787
commit ed3efe9bee
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,30 +251,45 @@ angular.module("umbraco").controller("Umbraco.PropertyEditors.NestedContent.Prop
$scope.getName = function (idx) {
var name = "Item " + (idx + 1);
var name = "";
if ($scope.model.value[idx]) {
var contentType = $scope.getContentTypeConfig($scope.model.value[idx].ncContentTypeAlias);
if (contentType != null && contentType.nameExp) {
// Run the expression against the stored dictionary value, NOT the node object
var item = $scope.model.value[idx];
if (contentType != null) {
// first try getting a name using the configured label template
if (contentType.nameExp) {
// Run the expression against the stored dictionary value, NOT the node object
var item = $scope.model.value[idx];
// Add a temporary index property
item["$index"] = (idx + 1);
// Add a temporary index property
item["$index"] = (idx + 1);
var newName = contentType.nameExp(item);
if (newName && (newName = $.trim(newName))) {
name = newName;
var newName = contentType.nameExp(item);
if (newName && (newName = $.trim(newName))) {
name = newName;
}
// Delete the index property as we don't want to persist it
delete item["$index"];
}
// Delete the index property as we don't want to persist it
delete item["$index"];
// if we still do not have a name and we have multiple content types to choose from, use the content type name (same as is shown in the content type picker)
if (!name && $scope.scaffolds.length > 1) {
var scaffold = $scope.getScaffold(contentType.ncAlias);
if (scaffold) {
name = scaffold.contentTypeName;
}
}
}
}
if (!name) {
name = "Item " + (idx + 1);
}
// Update the nodes actual name value
if ($scope.nodes[idx].name !== name) {
$scope.nodes[idx].name = name;