diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/contenttypes/contenttypes.html b/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/contenttypes/contenttypes.html
index 60e9bd26f2..b98b316385 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/contenttypes/contenttypes.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/dialogs/contenttypes/contenttypes.html
@@ -1,5 +1,5 @@
-
+
{{ contentType.name }}
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/views/permissions/permissions.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttype/views/permissions/permissions.controller.js
index b6a059a7e4..593d70e571 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttype/views/permissions/permissions.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/views/permissions/permissions.controller.js
@@ -19,32 +19,7 @@ function PermissionsController($scope, contentTypeResource, $log, iconHelper) {
function init() {
contentTypeResource.getAll().then(function(contentTypes){
-
$scope.contentTypes = contentTypes;
-
- angular.forEach($scope.contentTypes, function(contentType){
-
- // convert legacy icons
- iconHelper.formatContentTypeIcons($scope.contentTypes);
-
- var exists = false;
-
- angular.forEach($scope.contentType.allowedContentTypes, function(allowedContentType){
-
- if( contentType.alias === allowedContentType.alias ) {
- exists = true;
- }
-
- });
-
- if(exists) {
- contentType.show = false;
- } else {
- contentType.show = true;
- }
-
- });
-
});
}
@@ -55,16 +30,6 @@ function PermissionsController($scope, contentTypeResource, $log, iconHelper) {
var selectedContentTypeIndex = $scope.contentType.allowedContentTypes.indexOf(selectedContentType);
$scope.contentType.allowedContentTypes.splice(selectedContentTypeIndex, 1);
- // show content type in content types array
- for (var contentTypeIndex = 0; contentTypeIndex < $scope.contentTypes.length; contentTypeIndex++) {
-
- var contentType = $scope.contentTypes[contentTypeIndex];
-
- if( selectedContentType.alias === contentType.alias ) {
- contentType.show = true;
- }
- }
-
};
$scope.addItemOverlay = function ($event) {
@@ -73,6 +38,7 @@ function PermissionsController($scope, contentTypeResource, $log, iconHelper) {
$scope.dialogModel = {};
$scope.dialogModel.title = "Choose content type";
$scope.dialogModel.contentTypes = $scope.contentTypes;
+ $scope.dialogModel.allowedContentTypes = $scope.contentType.allowedContentTypes;
$scope.dialogModel.event = $event;
$scope.dialogModel.view = "views/documentType/dialogs/contenttypes/contenttypes.html";
$scope.showDialog = true;
@@ -95,16 +61,6 @@ function PermissionsController($scope, contentTypeResource, $log, iconHelper) {
// push to content type model
$scope.contentType.allowedContentTypes.push(reformatedContentType);
- // hide selected content type from content types array
- for (var contentTypeIndex = 0; contentTypeIndex < $scope.contentTypes.length; contentTypeIndex++) {
-
- var contentType = $scope.contentTypes[contentTypeIndex];
-
- if( selectedContentType.alias === contentType.alias ) {
- contentType.show = false;
- }
- }
-
$scope.showDialog = false;
$scope.dialogModel = null;
};
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/views/permissions/permissions.html b/src/Umbraco.Web.UI.Client/src/views/documenttype/views/permissions/permissions.html
index a8d06feeee..6b67086d1f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttype/views/permissions/permissions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/views/permissions/permissions.html
@@ -51,12 +51,12 @@
-