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

Merge pull request #6222 from patrickdemooij9/temp-5724

Browse Source 
5724: Unable to add multiple property groups
(cherry picked from commit 3163b5f2fe)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
This commit is contained in:
Sebastiaan Janssen
2019-09-05 16:45:33 +02:00
parent d044dd07c3
commit c7ea93199f
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -384,6 +384,8 @@
// activate group
scope.activateGroup(group);
// push new init tab to the scope
addInitGroup(scope.model.groups);
};
scope.activateGroup = function(selectedGroup) {
@@ -402,7 +404,6 @@
scope.removeGroup = function(groupIndex) {
scope.model.groups.splice(groupIndex, 1);
addInitGroup(scope.model.groups);
};
scope.updateGroupTitle = function(group) {
@@ -531,10 +532,8 @@
// set focus on init property
var numberOfProperties = group.properties.length;
group.properties[numberOfProperties - 1].focus = true;
// push new init tab to the scope
addInitGroup(scope.model.groups);
notifyChanged();
},
close: function() {
if(_.isEqual(oldPropertyModel, propertyModel) === false) {
@@ -580,17 +579,7 @@
// remove property
tab.properties.splice(propertyIndex, 1);
// if the last property in group is an placeholder - remove add new tab placeholder
if(tab.properties.length === 1 && tab.properties[0].propertyState === "init") {
angular.forEach(scope.model.groups, function(group, index, groups){
if(group.tabState === 'init') {
groups.splice(index, 1);
}
});
}
notifyChanged();
};
function addInitProperty(group) {