{{error.errorMsg}}
{{error.data.message}}
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
index 289bf607c3..595fb97a3d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
@@ -15,36 +15,6 @@
var localizeSaving = localizationService.localize("general_saving");
var evts = [];
- var disableTemplates = Umbraco.Sys.ServerVariables.features.disabledFeatures.disableTemplates;
-
- var buttons = [
- {
- "name": localizationService.localize("general_design"),
- "alias": "design",
- "icon": "icon-document-dashed-line",
- "view": "views/documenttypes/views/design/design.html",
- "active": true
- },
- {
- "name": localizationService.localize("general_listView"),
- "alias": "listView",
- "icon": "icon-list",
- "view": "views/documenttypes/views/listview/listview.html"
- },
- {
- "name": localizationService.localize("general_rights"),
- "alias": "permissions",
- "icon": "icon-keychain",
- "view": "views/documenttypes/views/permissions/permissions.html"
- },
- {
- "name": localizationService.localize("treeHeaders_templates"),
- "alias": "templates",
- "icon": "icon-layout",
- "view": "views/documenttypes/views/templates/templates.html"
- }
- ];
-
vm.save = save;
vm.currentNode = null;
@@ -53,73 +23,97 @@
vm.page = {};
vm.page.loading = false;
vm.page.saveButtonState = "init";
- vm.page.navigation = [];
-
- loadButtons();
+ vm.page.navigation = [
+ {
+ "name": localizationService.localize("general_design"),
+ "alias": "design",
+ "icon": "icon-document-dashed-line",
+ "view": "views/documenttypes/views/design/design.html",
+ "active": true
+ },
+ {
+ "name": localizationService.localize("general_listView"),
+ "alias": "listView",
+ "icon": "icon-list",
+ "view": "views/documenttypes/views/listview/listview.html"
+ },
+ {
+ "name": localizationService.localize("general_rights"),
+ "alias": "permissions",
+ "icon": "icon-keychain",
+ "view": "views/documenttypes/views/permissions/permissions.html"
+ },
+ {
+ "name": localizationService.localize("treeHeaders_templates"),
+ "alias": "templates",
+ "icon": "icon-layout",
+ "view": "views/documenttypes/views/templates/templates.html"
+ }
+ ];
vm.page.keyboardShortcutsOverview = [
- {
- "name": localizationService.localize("main_sections"),
- "shortcuts": [
- {
- "description": localizationService.localize("shortcuts_navigateSections"),
- "keys": [{ "key": "1" }, { "key": "4" }],
- "keyRange": true
- }
- ]
- },
- {
- "name": localizationService.localize("general_design"),
- "shortcuts": [
- {
- "description": localizationService.localize("shortcuts_addTab"),
- "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
- },
- {
- "description": localizationService.localize("shortcuts_addProperty"),
- "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
- },
- {
- "description": localizationService.localize("shortcuts_addEditor"),
- "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }]
- },
- {
- "description": localizationService.localize("shortcuts_editDataType"),
- "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
- }
- ]
- },
- {
- "name": localizationService.localize("general_listView"),
- "shortcuts": [
- {
- "description": localizationService.localize("shortcuts_toggleListView"),
- "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "l" }]
- }
- ]
- },
- {
- "name": localizationService.localize("general_rights"),
- "shortcuts": [
- {
- "description": localizationService.localize("shortcuts_toggleAllowAsRoot"),
- "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "r" }]
- },
- {
- "description": localizationService.localize("shortcuts_addChildNode"),
- "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "c" }]
- }
- ]
- },
- {
- "name": localizationService.localize("treeHeaders_templates"),
- "shortcuts": [
- {
- "description": localizationService.localize("shortcuts_addTemplate"),
- "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
- }
- ]
- }
+ {
+ "name": localizationService.localize("main_sections"),
+ "shortcuts": [
+ {
+ "description": localizationService.localize("shortcuts_navigateSections"),
+ "keys": [{ "key": "1" }, { "key": "4" }],
+ "keyRange": true
+ }
+ ]
+ },
+ {
+ "name": localizationService.localize("general_design"),
+ "shortcuts": [
+ {
+ "description": localizationService.localize("shortcuts_addTab"),
+ "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
+ },
+ {
+ "description": localizationService.localize("shortcuts_addProperty"),
+ "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "p" }]
+ },
+ {
+ "description": localizationService.localize("shortcuts_addEditor"),
+ "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "e" }]
+ },
+ {
+ "description": localizationService.localize("shortcuts_editDataType"),
+ "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "d" }]
+ }
+ ]
+ },
+ {
+ "name": localizationService.localize("general_listView"),
+ "shortcuts": [
+ {
+ "description": localizationService.localize("shortcuts_toggleListView"),
+ "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "l" }]
+ }
+ ]
+ },
+ {
+ "name": localizationService.localize("general_rights"),
+ "shortcuts": [
+ {
+ "description": localizationService.localize("shortcuts_toggleAllowAsRoot"),
+ "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "r" }]
+ },
+ {
+ "description": localizationService.localize("shortcuts_addChildNode"),
+ "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "c" }]
+ }
+ ]
+ },
+ {
+ "name": localizationService.localize("treeHeaders_templates"),
+ "shortcuts": [
+ {
+ "description": localizationService.localize("shortcuts_addTemplate"),
+ "keys": [{ "key": "alt" }, { "key": "shift" }, { "key": "t" }]
+ }
+ ]
+ }
];
contentTypeHelper.checkModelsBuilderStatus().then(function (result) {
@@ -150,7 +144,7 @@
vm.page.saveButtonState = "busy";
localizationService.localize("modelsBuilder_buildingModels").then(function (headerValue) {
- localizationService.localize("modelsBuilder_waitingMessage").then(function (msgValue) {
+ localizationService.localize("modelsBuilder_waitingMessage").then(function(msgValue) {
notificationsService.info(headerValue, msgValue);
});
});
@@ -161,26 +155,26 @@
if (!result.lastError) {
//re-check model status
- contentTypeHelper.checkModelsBuilderStatus().then(function (statusResult) {
+ contentTypeHelper.checkModelsBuilderStatus().then(function(statusResult) {
vm.page.modelsBuilder = statusResult;
});
//clear and add success
vm.page.saveButtonState = "init";
- localizationService.localize("modelsBuilder_modelsGenerated").then(function (value) {
+ localizationService.localize("modelsBuilder_modelsGenerated").then(function(value) {
notificationsService.success(value);
});
} else {
vm.page.saveButtonState = "error";
- localizationService.localize("modelsBuilder_modelsExceptionInUlog").then(function (value) {
+ localizationService.localize("modelsBuilder_modelsExceptionInUlog").then(function(value) {
notificationsService.error(value);
});
}
}, function () {
vm.page.saveButtonState = "error";
- localizationService.localize("modelsBuilder_modelsGeneratedError").then(function (value) {
+ localizationService.localize("modelsBuilder_modelsGeneratedError").then(function(value) {
notificationsService.error(value);
});
});
@@ -195,7 +189,7 @@
//we are creating so get an empty data type item
contentTypeResource.getScaffold($routeParams.id)
- .then(function (dt) {
+ .then(function(dt) {
init(dt);
vm.page.loading = false;
});
@@ -213,26 +207,12 @@
});
}
- function loadButtons() {
-
- angular.forEach(buttons,
- function (val, index) {
-
- if (disableTemplates === true && val.alias === "templates") {
- buttons.splice(index, 1);
- }
-
- });
-
- vm.page.navigation = buttons;
- }
-
/* ---------- SAVE ---------- */
function save() {
// only save if there is no overlays open
- if (overlayHelper.getNumberOfOverlays() === 0) {
+ if(overlayHelper.getNumberOfOverlays() === 0) {
var deferred = $q.defer();
@@ -253,7 +233,7 @@
// we need to rebind... the IDs that have been created!
rebindCallback: function (origContentType, savedContentType) {
vm.contentType.id = savedContentType.id;
- vm.contentType.groups.forEach(function (group) {
+ vm.contentType.groups.forEach(function(group) {
if (!group.name) return;
var k = 0;
while (k < savedContentType.groups.length && savedContentType.groups[k].name != group.name)
@@ -293,7 +273,7 @@
}
else {
localizationService.localize("speechBubbles_validationFailedHeader").then(function (headerValue) {
- localizationService.localize("speechBubbles_validationFailedMessage").then(function (msgValue) {
+ localizationService.localize("speechBubbles_validationFailedMessage").then(function(msgValue) {
notificationsService.error(headerValue, msgValue);
});
});
@@ -351,7 +331,7 @@
function getDataTypeDetails(property) {
if (property.propertyState !== "init") {
dataTypeResource.getById(property.dataTypeId)
- .then(function (dataType) {
+ .then(function(dataType) {
property.dataTypeIcon = dataType.icon;
property.dataTypeName = dataType.name;
});
@@ -365,7 +345,7 @@
});
}
- evts.push(eventsService.on("app.refreshEditor", function (name, error) {
+ evts.push(eventsService.on("app.refreshEditor", function(name, error) {
loadDocumentType();
}));
diff --git a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
index dac78e9979..d401c1c266 100644
--- a/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
+++ b/src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
@@ -13,7 +13,6 @@ using Umbraco.Core;
using Umbraco.Core.Configuration;
using Umbraco.Core.Configuration.UmbracoSettings;
using Umbraco.Core.IO;
-using Umbraco.Web.Features;
using Umbraco.Web.HealthCheck;
using Umbraco.Web.Models.ContentEditing;
using Umbraco.Web.Mvc;
@@ -53,8 +52,7 @@ namespace Umbraco.Web.Editors
{"umbracoUrls", new[] {"authenticationApiBaseUrl", "serverVarsJs", "externalLoginsUrl", "currentUserApiBaseUrl"}},
{"umbracoSettings", new[] {"allowPasswordReset", "imageFileTypes", "maxFileSize", "loginBackgroundImage"}},
{"application", new[] {"applicationPath", "cacheBuster"}},
- {"isDebuggingEnabled", new string[] { }},
- {"features", new [] {"disabledFeatures"}}
+ {"isDebuggingEnabled", new string[] { }}
};
//now do the filtering...
var defaults = GetServerVariables();
@@ -83,7 +81,7 @@ namespace Umbraco.Web.Editors
//TODO: This is ultra confusing! this same key is used for different things, when returning the full app when authenticated it is this URL but when not auth'd it's actually the ServerVariables address
// so based on compat and how things are currently working we need to replace the serverVarsJs one
- ((Dictionary
)defaults["umbracoUrls"])["serverVarsJs"] = _urlHelper.Action("ServerVariables", "BackOffice");
+ ((Dictionary) defaults["umbracoUrls"])["serverVarsJs"] = _urlHelper.Action("ServerVariables", "BackOffice");
return defaults;
}
@@ -330,18 +328,6 @@ namespace Umbraco.Web.Editors
.ToArray()
}
}
- },
- {
- "features", new Dictionary
- {
- {
- "disabledFeatures", new Dictionary
- {
- { "disableTemplates", true/*FeaturesResolver.Current.Features.Disabled.DisableTemplates*/}
- }
- }
-
- }
}
};
return defaultVals;
@@ -366,9 +352,9 @@ namespace Umbraco.Web.Editors
.ToArray();
return (from p in pluginTreesWithAttributes
- let treeAttr = p.attributes.OfType().Single()
- let pluginAttr = p.attributes.OfType().Single()
- select new Dictionary
+ let treeAttr = p.attributes.OfType().Single()
+ let pluginAttr = p.attributes.OfType().Single()
+ select new Dictionary
{
{"alias", treeAttr.Alias}, {"packageFolder", pluginAttr.AreaName}
}).ToArray();
diff --git a/src/Umbraco.Web/Features/DisabledFeatures.cs b/src/Umbraco.Web/Features/DisabledFeatures.cs
index 703e2d2292..b9d8d0a2d9 100644
--- a/src/Umbraco.Web/Features/DisabledFeatures.cs
+++ b/src/Umbraco.Web/Features/DisabledFeatures.cs
@@ -20,10 +20,5 @@ namespace Umbraco.Web.Features
/// Gets the disabled controllers.
///
public TypeList Controllers { get; private set; }
-
- ///
- /// If true, all references to templates will be removed in the back office and routing
- ///
- public bool DisableTemplates { get; set; }
}
}
diff --git a/src/Umbraco.Web/Features/EnabledFeatures.cs b/src/Umbraco.Web/Features/EnabledFeatures.cs
new file mode 100644
index 0000000000..7f0d047992
--- /dev/null
+++ b/src/Umbraco.Web/Features/EnabledFeatures.cs
@@ -0,0 +1,14 @@
+namespace Umbraco.Web.Features
+{
+ ///
+ /// Represents enabled features.
+ ///
+ internal class EnabledFeatures
+ {
+ ///
+ /// Specifies if rendering pipeline should ignore HasTemplate check when handling a request.
+ /// This is to allow JSON preview of content with no template set.
+ ///
+ public bool RenderNoTemplate { get; set; }
+ }
+}
diff --git a/src/Umbraco.Web/Features/UmbracoFeatures.cs b/src/Umbraco.Web/Features/UmbracoFeatures.cs
index abe9a76d06..8f65d6efb8 100644
--- a/src/Umbraco.Web/Features/UmbracoFeatures.cs
+++ b/src/Umbraco.Web/Features/UmbracoFeatures.cs
@@ -14,6 +14,7 @@ namespace Umbraco.Web.Features
public UmbracoFeatures()
{
Disabled = new DisabledFeatures();
+ Enabled = new EnabledFeatures();
}
// note
@@ -27,11 +28,16 @@ namespace Umbraco.Web.Features
/// Gets the disabled features.
///
public DisabledFeatures Disabled { get; set; }
-
+
///
- /// Determines whether a controller is enabled.
+ /// Gets the enabled features.
///
- public bool IsControllerEnabled(Type feature)
+ public EnabledFeatures Enabled { get; set; }
+
+ ///
+ /// Determines whether a feature is enabled.
+ ///
+ public bool IsEnabled(Type feature)
{
if (typeof(UmbracoApiControllerBase).IsAssignableFrom(feature))
return Disabled.Controllers.Contains(feature) == false;
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index bacdd2ffa9..3dd52d9bfb 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -393,12 +393,12 @@ namespace Umbraco.Web.Mvc
return GetWebFormsHandler();
}
- //Here we need to check if there is no hijacked route and no template assigned,
- //if this is the case we want to return a blank page, but we'll leave that up to the NoTemplateHandler.
- //We also check if templates have been disabled since if they are then we're allowed to render even though there's no template,
- //for example for json rendering in headless.
- if ((publishedContentRequest.HasTemplate == false && FeaturesResolver.Current.Features.Disabled.DisableTemplates == false)
- && routeDef.HasHijackedRoute == false)
+ //here we need to check if there is no hijacked route and no template assigned, if this is the case
+ //we want to return a blank page, but we'll leave that up to the NoTemplateHandler.
+ //we also check if we're allowed to render even though there's no template (json render in headless).
+ if (publishedContentRequest.HasTemplate == false &&
+ routeDef.HasHijackedRoute == false &&
+ FeaturesResolver.Current.Features.Enabled.RenderNoTemplate == false)
{
publishedContentRequest.UpdateOnMissingTemplate(); // will go 404
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index aa21001093..c6d528bb3d 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -331,6 +331,7 @@
+
diff --git a/src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs b/src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
index 098db125c9..dd1954663f 100644
--- a/src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Web.WebApi.Filters
if (FeaturesResolver.HasCurrent == false) return true;
var controllerType = actionContext.ControllerContext.ControllerDescriptor.ControllerType;
- return FeaturesResolver.Current.Features.IsControllerEnabled(controllerType);
+ return FeaturesResolver.Current.Features.IsEnabled(controllerType);
}
}
}
\ No newline at end of file