From 98c65ff8f4f83d3db247ad2c01c52edb366cbd85 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 27 Jan 2016 15:29:53 +0100 Subject: [PATCH 1/3] 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 @@ -
  • +
  • From 4bc51feccd31a8d4354d005009738ef920fc19e8 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 27 Jan 2016 15:31:29 +0100 Subject: [PATCH 2/3] fix semicolons --- .../src/views/documenttypes/create.controller.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 19a2c7f1d5..7f350eda42 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 @@ -19,7 +19,7 @@ function DocumentTypesCreateController($scope, $location, navigationService, con $scope.showCreateFolder = function() { $scope.model.creatingFolder = true; - } + }; $scope.createContainer = function () { if (formHelper.submitForm({ @@ -48,22 +48,22 @@ function DocumentTypesCreateController($scope, $location, navigationService, con } } }); - }; - } + } + }; $scope.createDocType = function() { $location.search('create', null); $location.search('notemplate', null); $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true"); navigationService.hideMenu(); - } + }; $scope.createComponent = function() { $location.search('create', null); $location.search('notemplate', null); $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true"); navigationService.hideMenu(); - } + }; } angular.module('umbraco').controller("Umbraco.Editors.DocumentTypes.CreateController", DocumentTypesCreateController); From b6715956086ae06bf3db53233edeee995cbd68c2 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 27 Jan 2016 15:34:15 +0100 Subject: [PATCH 3/3] fix tab indention --- .../views/documenttypes/create.controller.js | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) 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 7f350eda42..4e734b76a6 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 @@ -21,19 +21,26 @@ function DocumentTypesCreateController($scope, $location, navigationService, con $scope.model.creatingFolder = true; }; - $scope.createContainer = function () { - if (formHelper.submitForm({ - scope: $scope, - formCtrl: this.createFolderForm, - statusMessage: localizeCreateFolder - })) { - contentTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) { + $scope.createContainer = function() { + + if (formHelper.submitForm({scope: $scope, formCtrl: this.createFolderForm, statusMessage: localizeCreateFolder})) { + + contentTypeResource.createContainer(node.id, $scope.model.folderName).then(function(folderId) { navigationService.hideMenu(); - var currPath = node.path ? node.path : "-1"; - navigationService.syncTree({ tree: "documenttypes", path: currPath + "," + folderId, forceReload: true, activate: true }); - formHelper.resetForm({ scope: $scope }); + var currPath = node.path ? node.path : "-1"; + + navigationService.syncTree({ + tree: "documenttypes", + path: currPath + "," + folderId, + forceReload: true, + activate: true + }); + + formHelper.resetForm({ + scope: $scope + }); var section = appState.getSectionState("currentSection"); @@ -59,11 +66,11 @@ function DocumentTypesCreateController($scope, $location, navigationService, con }; $scope.createComponent = function() { - $location.search('create', null); - $location.search('notemplate', null); - $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true"); - navigationService.hideMenu(); - }; + $location.search('create', null); + $location.search('notemplate', null); + $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true"); + navigationService.hideMenu(); + }; } angular.module('umbraco').controller("Umbraco.Editors.DocumentTypes.CreateController", DocumentTypesCreateController);