From b4aad1957379f3460232cd070a8ccf4e59023a6b Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 14 Mar 2018 13:23:33 +1100 Subject: [PATCH] Revert "Merge pull request #2508 from umbraco/temp-U4-11076" This reverts commit 4161d244c1aa59b025c7d758065578c111e7ee83, reversing changes made to eea87e411f37f118524e0d19f906a9866de72557. --- .../content/umbcontentnodeinfo.directive.js | 2 - .../content/umb-content-node-info.html | 26 ++- .../views/documenttypes/create.controller.js | 30 +-- .../src/views/documenttypes/create.html | 16 +- .../views/documenttypes/edit.controller.js | 220 ++++++++---------- .../Editors/BackOfficeServerVariables.cs | 24 +- src/Umbraco.Web/Features/DisabledFeatures.cs | 5 - src/Umbraco.Web/Features/EnabledFeatures.cs | 14 ++ src/Umbraco.Web/Features/UmbracoFeatures.cs | 12 +- src/Umbraco.Web/Mvc/RenderRouteHandler.cs | 12 +- src/Umbraco.Web/Umbraco.Web.csproj | 1 + .../Filters/FeatureAuthorizeAttribute.cs | 2 +- 12 files changed, 168 insertions(+), 196 deletions(-) create mode 100644 src/Umbraco.Web/Features/EnabledFeatures.cs diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js index b2bbd9006a..2ce0c5a22e 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js @@ -8,8 +8,6 @@ var evts = []; var isInfoTab = false; scope.publishStatus = {}; - - scope.disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates; function onInit() { diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html index f2be5604ed..564d50951e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html @@ -171,25 +171,27 @@ {{publishStatus.label}} - + {{node.createDateFormatted}} by {{ node.owner.name }} - + - - @@ -198,7 +200,7 @@
{{ node.id }}
{{ node.key }} - + 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 aade96c3cc..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 @@ -14,21 +14,18 @@ function DocumentTypesCreateController($scope, $location, navigationService, con creatingFolder: false, }; - var disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates; - $scope.model.disableTemplates = disableTemplates; - var node = $scope.dialogOptions.currentNode, localizeCreateFolder = localizationService.localize("defaultdialog_createFolder"); - $scope.showCreateFolder = function () { + $scope.showCreateFolder = function() { $scope.model.creatingFolder = true; }; - $scope.createContainer = function () { + $scope.createContainer = function() { - if (formHelper.submitForm({ scope: $scope, formCtrl: this.createFolderForm, statusMessage: localizeCreateFolder })) { + if (formHelper.submitForm({scope: $scope, formCtrl: this.createFolderForm, statusMessage: localizeCreateFolder})) { - contentTypeResource.createContainer(node.id, $scope.model.folderName).then(function (folderId) { + contentTypeResource.createContainer(node.id, $scope.model.folderName).then(function(folderId) { navigationService.hideMenu(); @@ -47,7 +44,7 @@ function DocumentTypesCreateController($scope, $location, navigationService, con var section = appState.getSectionState("currentSection"); - }, function (err) { + }, function(err) { $scope.error = err; @@ -61,17 +58,14 @@ function DocumentTypesCreateController($scope, $location, navigationService, con } }; - // Disabling logic for creating document type with template if disableTemplates is set to true - if (!disableTemplates) { - $scope.createDocType = function () { - $location.search('create', null); - $location.search('notemplate', null); - $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true"); - navigationService.hideMenu(); - }; - } + $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 () { + $scope.createComponent = function() { $location.search('create', null); $location.search('notemplate', null); $location.path("/settings/documenttypes/edit/" + node.id).search("create", "true").search("notemplate", "true"); 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 e5043be785..b61a4c014e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html @@ -4,7 +4,7 @@
Create an item under {{currentNode.name}}