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

11048: Bugfix for groups and properties that get replaced (#11257)

Browse Source
This commit is contained in:
patrickdemooij9
2021-10-12 14:47:03 +02:00
committed by GitHub
parent 3f5d9df2a2
commit 1605dc10bd
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
View File

@@ -96,7 +96,7 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
group.convertingToTab = true; group.convertingToTab = true;
group.type = this.TYPE_TAB; group.type = this.TYPE_TAB;
const newAlias = this.generateLocalAlias(group.name); const newAlias = this.generateLocalAlias(group.name);
// when checking for alias uniqueness we need to exclude the current group or the alias would get a + 1 // when checking for alias uniqueness we need to exclude the current group or the alias would get a + 1
const otherGroups = [...groups].filter(groupCopy => !groupCopy.convertingToTab); const otherGroups = [...groups].filter(groupCopy => !groupCopy.convertingToTab);
@@ -445,6 +445,12 @@ function contentTypeHelper(contentTypeResource, dataTypeResource, $filter, $inje
// The saved content type might have updated values (eg. new IDs/keys), so make sure the view model is updated // The saved content type might have updated values (eg. new IDs/keys), so make sure the view model is updated
contentType.ModelState = savedContentType.ModelState; contentType.ModelState = savedContentType.ModelState;
contentType.id = savedContentType.id; contentType.id = savedContentType.id;
// Prevent rebinding if there was an error: https://github.com/umbraco/Umbraco-CMS/pull/11257
if (savedContentType.ModelState) {
return;
}
contentType.groups.forEach(function (group) { contentType.groups.forEach(function (group) {
if (!group.alias) return; if (!group.alias) return;