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

fixes merge/rebase with latest other pr merge

Browse Source
This commit is contained in:
Shannon
2016-01-11 17:21:59 +01:00
parent b89d17914d
commit e17c900beb
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,7 +155,6 @@
scope.compositionsDialogModel = {
title: "Compositions",
contentType: scope.model,
availableCompositeContentTypes: scope.model.availableCompositeContentTypes,
compositeContentTypes: scope.model.compositeContentTypes,
view: "views/common/overlays/contenttypeeditor/compositions/compositions.html",
confirmSubmit: {
@@ -164,7 +163,6 @@
checkboxLabel: "I know what I'm doing",
enable: true
},
show: true,
submit: function(model, oldModel, confirmed) {
var compositionRemoved = false;
@@ -242,6 +240,24 @@
}
};
var availableContentTypeResource = scope.contentType === "documentType" ? contentTypeResource.getAvailableCompositeContentTypes : mediaTypeResource.getAvailableCompositeContentTypes;
var countContentTypeResource = scope.contentType === "documentType" ? contentTypeResource.getCount : mediaTypeResource.getCount;
$q.all([
//get available composite types
availableContentTypeResource(scope.model.id).then(function (result) {
scope.compositionsDialogModel.availableCompositeContentTypes = result;
// convert icons for composite content types
iconHelper.formatContentTypeIcons(scope.compositionsDialogModel.availableCompositeContentTypes);
}),
//get content type count
countContentTypeResource().then(function (result) {
scope.compositionsDialogModel.totalContentTypes = result;
})
]).then(function () {
//resolves when both other promises are done, now show it
scope.compositionsDialogModel.show = true;
});
};