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

dont move group if alias already exists in the context.

Browse Source
This commit is contained in:
Niels Lyngsø
2021-07-19 15:33:44 +02:00
parent f10e0872d5
commit bc0f304556
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
View File

@@ -115,6 +115,13 @@
const parentAlias = scope.openTabAlias,
oldAlias = group.alias || null, // null when group comes from root aka. 'generic'
newAlias = contentEditingHelper.updateParentAlias(oldAlias, parentAlias);
// Check alias is unique
// TODO: we should properly do this on hover, to let user know it cant be moved.
if (isAliasUnique(newAlias) === false) {
return;
}
group.alias = newAlias;
group.parentAlias = parentAlias;
updateDescendingAliases(oldAlias, newAlias);
@@ -142,7 +149,24 @@
accept: '.umb-group-builder__property-sortable, .umb-group-builder__group-sortable',
tolerance : 'pointer',
over: function (evt, ui) {
scope.openTabAlias = evt.target.dataset.tabAlias || null;
const hoveredTabAlias = evt.target.dataset.tabAlias || null;;
// if group
if (ui.draggable[0].dataset.groupKey) {
const groupKey = ui.draggable[0].dataset.groupKey ? ui.draggable[0].dataset.groupKey : false;
const group = groupKey ? scope.model.groups.find(group => group.key === groupKey) : {};
const newAlias = contentEditingHelper.updateParentAlias(group.alias || null, hoveredTabAlias);
// Check alias is unique
if (group.alias !== newAlias && isAliasUnique(newAlias) === false) {
// TODO: Missing UI indication of why you cant move here.
return;
}
}
scope.openTabAlias = hoveredTabAlias;
scope.$evalAsync();
}
};

4
src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html
View File

@@ -120,9 +120,7 @@
ng-repeat="(groupIndex, group) in model.groups track by group.key"
ng-show="group.type === 0 && group.parentAlias === openTabAlias"
ng-class="{'umb-group-builder__group-sortable': sortingMode && !group.inherited}"
data-group-key="{{group.key}}"
data-group-alias="{{group.alias}}"
data-group-parent-alias="{{group.parentAlias}}">
data-group-key="{{group.key}}">
<umb-content-type-group
ng-if="group.tabState !== 'init'"