From e17c900beb964ab551813a2eb37677cc2f5f417e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 11 Jan 2016 17:21:59 +0100
Subject: [PATCH] fixes merge/rebase with latest other pr merge

---
 .../components/umbgroupsbuilder.directive.js  | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
index 2a54f57a6c..3ab653a3c3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
@@ -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;
+        });
+
       };