From 98c65ff8f4f83d3db247ad2c01c52edb366cbd85 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Wed, 27 Jan 2016 15:29:53 +0100
Subject: [PATCH] U4-7847 Do not allow folders to be created underneath content
 types (or data types)

---
 .../src/views/documenttypes/create.controller.js                | 1 +
 src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
index 9e4a804010..19a2c7f1d5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.controller.js
@@ -9,6 +9,7 @@
 function DocumentTypesCreateController($scope, $location, navigationService, contentTypeResource, formHelper, appState, notificationsService, localizationService) {
 
     $scope.model = {
+        allowCreateFolder: $scope.dialogOptions.currentNode.parentId === null || $scope.dialogOptions.currentNode.nodeType === "container",
         folderName: "",
         creatingFolder: false,
     };
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
index 35b718f7a4..f837e7292b 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
@@ -20,7 +20,7 @@
                 <span class="menu-label"><localize key="create_documentTypeWithoutTemplate"></localize></span>
               </a>
             </li>
-            <li>
+            <li ng-if="model.allowCreateFolder">
                 <a href="" ng-click="showCreateFolder()">
                     <i class="large icon-folder"></i>
                     <span class="menu-label"><localize key="general_folder"></localize></span>