From 405ed44bb18ab6f5de3b2372b511497470198f89 Mon Sep 17 00:00:00 2001 From: Callum Whyte Date: Tue, 21 Sep 2021 07:41:21 +0100 Subject: [PATCH] Falling back to contentTypeName when Block List label is empty (#10963) * Falling back to contentTypeName when Block List label is empty * Adding $contentTypeName variable for Block List labels --- .../common/services/blockeditormodelobject.service.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js index cb06218618..4f5f47fb81 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js @@ -99,20 +99,21 @@ } } - /** * Generate label for Block, uses either the labelInterpolator or falls back to the contentTypeName. * @param {Object} blockObject BlockObject to recive data values from. */ function getBlockLabel(blockObject) { if (blockObject.labelInterpolator !== undefined) { - var labelVars = Object.assign({"$settings": blockObject.settingsData || {}, "$layout": blockObject.layout || {}, "$index": (blockObject.index || 0)+1 }, blockObject.data); - return blockObject.labelInterpolator(labelVars); + var labelVars = Object.assign({"$contentTypeName": blockObject.content.contentTypeName, "$settings": blockObject.settingsData || {}, "$layout": blockObject.layout || {}, "$index": (blockObject.index || 0)+1 }, blockObject.data); + var label = blockObject.labelInterpolator(labelVars); + if (label) { + return label; + } } return blockObject.content.contentTypeName; } - /** * Used to add watchers on all properties in a content or settings model */