Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Falling back to contentTypeName when Block List label is empty #10963

Merged
merged 2 commits into from
Sep 21, 2021
+5 −4
Merged

Falling back to contentTypeName when Block List label is empty #10963

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e112d1d
Falling back to contentTypeName when Block List label is empty
callumbwhyte Aug 26, 2021
3b25802
Adding $contentTypeName variable for Block List labels
callumbwhyte Aug 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,20 +97,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
*/
Expand Down