diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
index 8aea4fb97f..c72f8fc777 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
@@ -159,7 +159,7 @@
placeholder: 'sortable-placeholder',
forcePlaceholderSize: true,
helper: function (e, ui) {
- // When sorting table rows, the cells collapse. This helper fixes that: http://www.foliotek.com/devblog/make-table-rows-sortable-using-jquery-ui-sortable/
+ // When sorting table rows, the cells collapse. This helper fixes that: https://www.foliotek.com/devblog/make-table-rows-sortable-using-jquery-ui-sortable/
ui.children().each(function () {
$(this).width($(this).width());
});
@@ -181,7 +181,7 @@
start: function (e, ui) {
//ui.placeholder.html("
");
- // Build a placeholder cell that spans all the cells in the row: http://stackoverflow.com/questions/25845310/jquery-ui-sortable-and-table-cell-size
+ // Build a placeholder cell that spans all the cells in the row: https://stackoverflow.com/questions/25845310/jquery-ui-sortable-and-table-cell-size
var cellCount = 0;
$('td, th', ui.helper).each(function () {
// For each td or th try and get it's colspan attribute, and add that or 1 to the total
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
index 12482f562b..56490406f3 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
@@ -79,7 +79,7 @@ angular.module("umbraco")
addTag($scope.tagToAdd);
$scope.tagToAdd = "";
//this clears the value stored in typeahead so it doesn't try to add the text again
- // http://issues.umbraco.org/issue/U4-4947
+ // https://issues.umbraco.org/issue/U4-4947
$typeahead.typeahead('val', '');
};
diff --git a/src/Umbraco.Web.UI/umbraco_client/Dialogs/AssignDomain2.js b/src/Umbraco.Web.UI/umbraco_client/Dialogs/AssignDomain2.js
index ddf38733e1..b5921b6576 100644
--- a/src/Umbraco.Web.UI/umbraco_client/Dialogs/AssignDomain2.js
+++ b/src/Umbraco.Web.UI/umbraco_client/Dialogs/AssignDomain2.js
@@ -1,145 +1,145 @@
-Umbraco.Sys.registerNamespace("Umbraco.Dialogs");
-
-(function ($) {
-
- // register AssignDomain dialog
- Umbraco.Dialogs.AssignDomain2 = base2.Base.extend({
-
- _opts: null,
-
- _isRepeated: function (element) {
- var inputs = $('form input.domain');
- var elementName = element.attr('name');
- var repeated = false;
- inputs.each(function() {
- var input = $(this);
- if (input.attr('name') != elementName && input.val() == element.val())
- repeated = true;
- });
- return repeated;
- },
-
- // constructor
- constructor: function (opts) {
- // merge options with default
- this._opts = $.extend({
- invalidDomain: 'Invalid domain.',
- duplicateDomain: 'Domain has already been assigned.'
- }, opts);
- },
-
- // public methods/variables
-
- languages: null,
- language: null,
- domains: null,
-
- addDomain: function () {
- this.domains.push({
- Name: "",
- Lang: ""
- });
- },
-
- init: function () {
- var self = this;
-
- self.domains = ko.observableArray(self._opts.domains);
- self.languages = self._opts.languages;
- self.language = self._opts.language;
- self.removeDomain = function() { self.domains.remove(this); };
-
- ko.applyBindings(self);
-
- $.validator.addMethod("domain", function (value, element, param) {
- // beware! encode('test') == 'test-'
- // read eg https://rt.cpan.org/Public/Bug/Display.html?id=94347
- value = punycode.encode(value);
- // that regex is best-effort and certainly not exact
- var re = /^(http[s]?:\/\/)?([-\w]+(\.[-\w]+)*)(:\d+)?(\/[-\w]*|-)?$/gi;
- var isopt = this.optional(element);
- var retest = re.test(value);
- var ret = isopt || retest;
- return ret;
- }, self._opts.invalidDomain);
-
- function getDuplicateMessage(val, el) {
- var other = $(el).nextAll('input').val();
- var msg = self._opts.duplicateDomain
- if (other != "" && other != "!!!")
- msg = msg + ' (' + other + ')';
- return msg;
- }
-
- $.validator.addMethod("duplicate", function (value, element, param) {
- return $(element).nextAll('input').val() == "" && !self._isRepeated($(element));
- }, getDuplicateMessage);
-
- $.validator.addClassRules({
- domain: { domain: true },
- duplicate: { duplicate: true }
- });
-
- $('form').validate({
- debug: true,
- focusCleanup: true,
- onkeyup: false
- });
-
- $('form input.domain').on('focus', function(event) {
- if (event.type != 'focusin') return;
- $(this).nextAll('input').val("");
- });
-
- // force validation *now*
- $('form').valid();
-
- $('#btnSave').click(function () {
- if (!$('form').valid())
- return false;
-
- var mask = $('#komask');
- var masked = mask.parent();
- mask.height(masked.height());
- mask.width(masked.width());
- mask.show();
-
- var data = { nodeId: self._opts.nodeId, language: self.language ? self.language : 0, domains: self.domains };
- $.post(self._opts.restServiceLocation + 'PostSaveLanguageAndDomains', ko.toJSON(data), function (json) {
- mask.hide();
-
- if (json.Valid) {
- UmbClientMgr.closeModalWindow();
- }
- else {
- var inputs = $('form input.domain');
- inputs.each(function() { $(this).nextAll('input').val(""); });
- for (var i = 0; i < json.Domains.length; i++) {
- var d = json.Domains[i];
- if (d.Duplicate)
- inputs.each(function() {
- var input = $(this);
- if (input.val() == d.Name)
- input.nextAll('input').val(d.Other ? d.Other : "!!!");
- });
- }
- $('form').valid();
- }
- })
- .fail(function (xhr, textStatus, errorThrown) {
- mask.css('opacity', 1).css('color', "#ff0000").html(xhr.responseText);
- });
- return false;
- });
- }
-
- });
-
- // set defaults for jQuery ajax calls
- $.ajaxSetup({
- dataType: 'json',
- cache: false,
- contentType: 'application/json; charset=utf-8'
- });
-
-})(jQuery);
+Umbraco.Sys.registerNamespace("Umbraco.Dialogs");
+
+(function ($) {
+
+ // register AssignDomain dialog
+ Umbraco.Dialogs.AssignDomain2 = base2.Base.extend({
+
+ _opts: null,
+
+ _isRepeated: function (element) {
+ var inputs = $('form input.domain');
+ var elementName = element.attr('name');
+ var repeated = false;
+ inputs.each(function() {
+ var input = $(this);
+ if (input.attr('name') != elementName && input.val() == element.val())
+ repeated = true;
+ });
+ return repeated;
+ },
+
+ // constructor
+ constructor: function (opts) {
+ // merge options with default
+ this._opts = $.extend({
+ invalidDomain: 'Invalid domain.',
+ duplicateDomain: 'Domain has already been assigned.'
+ }, opts);
+ },
+
+ // public methods/variables
+
+ languages: null,
+ language: null,
+ domains: null,
+
+ addDomain: function () {
+ this.domains.push({
+ Name: "",
+ Lang: ""
+ });
+ },
+
+ init: function () {
+ var self = this;
+
+ self.domains = ko.observableArray(self._opts.domains);
+ self.languages = self._opts.languages;
+ self.language = self._opts.language;
+ self.removeDomain = function() { self.domains.remove(this); };
+
+ ko.applyBindings(self);
+
+ $.validator.addMethod("domain", function (value, element, param) {
+ // beware! encode('test') == 'test-'
+ // read eg https://rt.cpan.org/Public/Bug/Display.html?id=94347
+ value = punycode.encode(value);
+ // that regex is best-effort and certainly not exact
+ var re = /^(http[s]?:\/\/)?([-\w]+(\.[-\w]+)*)(:\d+)?(\/[-\w]*|-)?$/gi;
+ var isopt = this.optional(element);
+ var retest = re.test(value);
+ var ret = isopt || retest;
+ return ret;
+ }, self._opts.invalidDomain);
+
+ function getDuplicateMessage(val, el) {
+ var other = $(el).nextAll('input').val();
+ var msg = self._opts.duplicateDomain
+ if (other != "" && other != "!!!")
+ msg = msg + ' (' + other + ')';
+ return msg;
+ }
+
+ $.validator.addMethod("duplicate", function (value, element, param) {
+ return $(element).nextAll('input').val() == "" && !self._isRepeated($(element));
+ }, getDuplicateMessage);
+
+ $.validator.addClassRules({
+ domain: { domain: true },
+ duplicate: { duplicate: true }
+ });
+
+ $('form').validate({
+ debug: true,
+ focusCleanup: true,
+ onkeyup: false
+ });
+
+ $('form input.domain').on('focus', function(event) {
+ if (event.type != 'focusin') return;
+ $(this).nextAll('input').val("");
+ });
+
+ // force validation *now*
+ $('form').valid();
+
+ $('#btnSave').click(function () {
+ if (!$('form').valid())
+ return false;
+
+ var mask = $('#komask');
+ var masked = mask.parent();
+ mask.height(masked.height());
+ mask.width(masked.width());
+ mask.show();
+
+ var data = { nodeId: self._opts.nodeId, language: self.language ? self.language : 0, domains: self.domains };
+ $.post(self._opts.restServiceLocation + 'PostSaveLanguageAndDomains', ko.toJSON(data), function (json) {
+ mask.hide();
+
+ if (json.Valid) {
+ UmbClientMgr.closeModalWindow();
+ }
+ else {
+ var inputs = $('form input.domain');
+ inputs.each(function() { $(this).nextAll('input').val(""); });
+ for (var i = 0; i < json.Domains.length; i++) {
+ var d = json.Domains[i];
+ if (d.Duplicate)
+ inputs.each(function() {
+ var input = $(this);
+ if (input.val() == d.Name)
+ input.nextAll('input').val(d.Other ? d.Other : "!!!");
+ });
+ }
+ $('form').valid();
+ }
+ })
+ .fail(function (xhr, textStatus, errorThrown) {
+ mask.css('opacity', 1).css('color', "#ff0000").html(xhr.responseText);
+ });
+ return false;
+ });
+ }
+
+ });
+
+ // set defaults for jQuery ajax calls
+ $.ajaxSetup({
+ dataType: 'json',
+ cache: false,
+ contentType: 'application/json; charset=utf-8'
+ });
+
+})(jQuery);
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 1c61d3910d..7b5b728e7d 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1,1471 +1,1471 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Web.Http;
-using System.Web.Http.Controllers;
-using System.Web.Http.ModelBinding;
-using AutoMapper;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.Models.Membership;
-using Umbraco.Core.Persistence.DatabaseModelDefinitions;
-using Umbraco.Core.Services;
-using Umbraco.Web.Models.ContentEditing;
-using Umbraco.Web.Models.Mapping;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebApi.Binders;
-using Umbraco.Web.WebApi.Filters;
-using Umbraco.Core.Persistence.Querying;
-using Umbraco.Web.PublishedCache;
-using Umbraco.Core.Events;
-using Umbraco.Core.Models.Validation;
-using Umbraco.Web.Models;
-using Umbraco.Web.WebServices;
-using Umbraco.Web._Legacy.Actions;
-using Constants = Umbraco.Core.Constants;
-using ContentVariation = Umbraco.Core.Models.ContentVariation;
-using Language = Umbraco.Web.Models.ContentEditing.Language;
-
-namespace Umbraco.Web.Editors
-{
- ///
- /// The API controller used for editing content
- ///
- ///
- /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
- /// access to ALL of the methods on this controller will need access to the content application.
- ///
- [PluginController("UmbracoApi")]
- [UmbracoApplicationAuthorize(Constants.Applications.Content)]
- [ContentControllerConfiguration]
- public class ContentController : ContentControllerBase
- {
- private readonly IPublishedSnapshotService _publishedSnapshotService;
-
- public ContentController(IPublishedSnapshotService publishedSnapshotService)
- {
- if (publishedSnapshotService == null) throw new ArgumentNullException(nameof(publishedSnapshotService));
- _publishedSnapshotService = publishedSnapshotService;
- }
-
- ///
- /// Configures this controller with a custom action selector
- ///
- private class ContentControllerConfigurationAttribute : Attribute, IControllerConfiguration
- {
- public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
- {
- controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
- new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetNiceUrl", "id", typeof(int), typeof(Guid), typeof(Udi)),
- new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))
- ));
- }
- }
-
- ///
- /// Returns true if any content types have culture variation enabled
- ///
- ///
- [HttpGet]
- [WebApi.UmbracoAuthorize, OverrideAuthorization]
- public bool AllowsCultureVariation()
- {
- var contentTypes = Services.ContentTypeService.GetAll();
- return contentTypes.Any(contentType => contentType.VariesByCulture());
- }
-
- ///
- /// Return content for the specified ids
- ///
- ///
- ///
- [FilterAllowedOutgoingContent(typeof(IEnumerable
))]
- public IEnumerable GetByIds([FromUri]int[] ids)
- {
- //fixme what about cultures?
-
- var foundContent = Services.ContentService.GetByIds(ids);
- return foundContent.Select(x => MapToDisplay(x));
- }
-
- ///
- /// Updates the permissions for a content item for a particular user group
- ///
- ///
- /// Permission check is done for letter 'R' which is for
- [EnsureUserPermissionForContent("saveModel.ContentId", 'R')]
- public IEnumerable PostSaveUserGroupPermissions(UserGroupPermissionsSave saveModel)
- {
- if (saveModel.ContentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
- //TODO: Should non-admins be alowed to set granular permissions?
-
- var content = Services.ContentService.GetById(saveModel.ContentId);
- if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
- //current permissions explicitly assigned to this content item
- var contentPermissions = Services.ContentService.GetPermissions(content)
- .ToDictionary(x => x.UserGroupId, x => x);
-
- var allUserGroups = Services.UserService.GetAllUserGroups().ToArray();
-
- //loop through each user group
- foreach (var userGroup in allUserGroups)
- {
- //check if there's a permission set posted up for this user group
- IEnumerable groupPermissions;
- if (saveModel.AssignedPermissions.TryGetValue(userGroup.Id, out groupPermissions))
- {
- //create a string collection of the assigned letters
- var groupPermissionCodes = groupPermissions.ToArray();
-
- //check if there are no permissions assigned for this group save model, if that is the case we want to reset the permissions
- //for this group/node which will go back to the defaults
- if (groupPermissionCodes.Length == 0)
- {
- Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
- }
- //check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
- else if (userGroup.Permissions.UnsortedSequenceEqual(groupPermissionCodes))
- {
- //only remove them if they are actually currently assigned
- if (contentPermissions.ContainsKey(userGroup.Id))
- {
- //remove these permissions from this node for this group since the ones being assigned are the same as the defaults
- Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
- }
- }
- //if they are different we need to update, otherwise there's nothing to update
- else if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id].AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
- {
-
- Services.UserService.ReplaceUserGroupPermissions(userGroup.Id, groupPermissionCodes.Select(x => x[0]), content.Id);
- }
- }
- }
-
- return GetDetailedPermissions(content, allUserGroups);
- }
-
- ///
- /// Returns the user group permissions for user groups assigned to this node
- ///
- ///
- /// Permission check is done for letter 'R' which is for
- [EnsureUserPermissionForContent("contentId", 'R')]
- public IEnumerable GetDetailedPermissions(int contentId)
- {
- if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
- var content = Services.ContentService.GetById(contentId);
- if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
-
- //TODO: Should non-admins be able to see detailed permissions?
-
- var allUserGroups = Services.UserService.GetAllUserGroups();
-
- return GetDetailedPermissions(content, allUserGroups);
- }
-
- private IEnumerable GetDetailedPermissions(IContent content, IEnumerable allUserGroups)
- {
- //get all user groups and map their default permissions to the AssignedUserGroupPermissions model.
- //we do this because not all groups will have true assigned permissions for this node so if they don't have assigned permissions, we need to show the defaults.
-
- var defaultPermissionsByGroup = Mapper.Map>(allUserGroups).ToArray();
-
- var defaultPermissionsAsDictionary = defaultPermissionsByGroup
- .ToDictionary(x => Convert.ToInt32(x.Id), x => x);
-
- //get the actual assigned permissions
- var assignedPermissionsByGroup = Services.ContentService.GetPermissions(content).ToArray();
-
- //iterate over assigned and update the defaults with the real values
- foreach (var assignedGroupPermission in assignedPermissionsByGroup)
- {
- var defaultUserGroupPermissions = defaultPermissionsAsDictionary[assignedGroupPermission.UserGroupId];
-
- //clone the default permissions model to the assigned ones
- defaultUserGroupPermissions.AssignedPermissions = AssignedUserGroupPermissions.ClonePermissions(defaultUserGroupPermissions.DefaultPermissions);
-
- //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions
- //and we'll re-check it if it's one of the explicitly assigned ones
- foreach (var permission in defaultUserGroupPermissions.AssignedPermissions.SelectMany(x => x.Value))
- {
- permission.Checked = false;
- permission.Checked = assignedGroupPermission.AssignedPermissions.Contains(permission.PermissionCode, StringComparer.InvariantCulture);
- }
-
- }
-
- return defaultPermissionsByGroup;
- }
-
- ///
- /// Returns an item to be used to display the recycle bin for content
- ///
- ///
- /// Gets the content json for the content id
- ///
- ///
- /// Gets the content json for the content id
- ///
- ///
- /// Gets the content json for the content id
- ///
- ///
- /// Gets an empty content item for the
- ///
- ///
- /// If this is a container type, we'll remove the umbContainerView tab for a new item since
- /// it cannot actually list children if it doesn't exist yet.
- ///
- [OutgoingEditorModelEvent]
- public ContentItemDisplay GetEmpty(string contentTypeAlias, int parentId)
- {
- var contentType = Services.ContentTypeService.Get(contentTypeAlias);
- if (contentType == null)
- {
- throw new HttpResponseException(HttpStatusCode.NotFound);
- }
-
- var emptyContent = Services.ContentService.Create("", parentId, contentType.Alias, Security.GetUserId().ResultOr(0));
- var mapped = MapToDisplay(emptyContent);
-
- //remove this tab if it exists: umbContainerView
- var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
- mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
-
- if (contentType.VariesByCulture())
- {
- //Remove all variants except for the default since currently the default must be saved before other variants can be edited
- //TODO: Allow for editing all variants at once ... this will be a future task
- mapped.Variants = new[] { mapped.Variants.FirstOrDefault(x => x.IsCurrent) };
- }
-
- return mapped;
- }
-
- [OutgoingEditorModelEvent]
- public ContentItemDisplay GetEmpty(int blueprintId, int parentId)
- {
- var blueprint = Services.ContentService.GetBlueprintById(blueprintId);
- if (blueprint == null)
- {
- throw new HttpResponseException(HttpStatusCode.NotFound);
- }
-
- blueprint.Id = 0;
- blueprint.Name = string.Empty;
- blueprint.ParentId = parentId;
-
- var mapped = Mapper.Map(blueprint);
-
- //remove this tab if it exists: umbContainerView
- var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
- mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
- return mapped;
- }
-
- ///
- /// Gets the Url for a given node ID
- ///
- ///
- /// Gets the Url for a given node ID
- ///
- ///
- /// Gets the Url for a given node ID
- ///
- ///
- /// Gets the children for the content id passed in
- ///
- /// >), "Items")]
- public PagedResult> GetChildren(
- int id,
- int pageNumber = 0, //TODO: This should be '1' as it's not the index
- int pageSize = 0,
- string orderBy = "SortOrder",
- Direction orderDirection = Direction.Ascending,
- bool orderBySystemField = true,
- string filter = "")
- {
- return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
- }
-
- ///
- /// Gets the children for the content id passed in
- ///
- /// >), "Items")]
- public PagedResult> GetChildren(
- int id,
- string includeProperties,
- int pageNumber = 0, //TODO: This should be '1' as it's not the index
- int pageSize = 0,
- string orderBy = "SortOrder",
- Direction orderDirection = Direction.Ascending,
- bool orderBySystemField = true,
- string filter = "")
- {
- long totalChildren;
- IContent[] children;
- if (pageNumber > 0 && pageSize > 0)
- {
- IQuery queryFilter = null;
- if (filter.IsNullOrWhiteSpace() == false)
- {
- //add the default text filter
- queryFilter = SqlContext.Query()
- .Where(x => x.Name.Contains(filter));
- }
-
- children = Services.ContentService
- .GetPagedChildren(
- id, (pageNumber - 1), pageSize,
- out totalChildren,
- orderBy, orderDirection, orderBySystemField,
- queryFilter).ToArray();
- }
- else
- {
- children = Services.ContentService.GetChildren(id).ToArray();
- totalChildren = children.Length;
- }
-
- if (totalChildren == 0)
- {
- return new PagedResult>(0, 0, 0);
- }
-
- var pagedResult = new PagedResult>(totalChildren, pageNumber, pageSize);
- pagedResult.Items = children.Select(content =>
- Mapper.Map>(content,
- opts =>
- {
- // if there's a list of property aliases to map - we will make sure to store this in the mapping context.
- if (String.IsNullOrWhiteSpace(includeProperties) == false)
- {
- opts.Items["IncludeProperties"] = includeProperties.Split(new[] { ", ", "," }, StringSplitOptions.RemoveEmptyEntries);
- }
- }));
-
- return pagedResult;
- }
-
- ///
- /// Returns permissions for all nodes passed in for the current user
- /// TODO: This should be moved to the CurrentUserController?
- ///
- /// GetPermissions(int[] nodeIds)
- {
- var permissions = Services.UserService
- .GetPermissions(Security.CurrentUser, nodeIds);
-
- var permissionsDictionary = new Dictionary();
- foreach (var nodeId in nodeIds)
- {
- var aggregatePerms = permissions.GetAllPermissions(nodeId).ToArray();
- permissionsDictionary.Add(nodeId, aggregatePerms);
- }
-
- return permissionsDictionary;
- }
-
- ///
- /// Checks a nodes permission for the current user
- /// TODO: This should be moved to the CurrentUserController?
- ///
- ///
- /// Creates a blueprint from a content item
- ///
- ///
- /// Saves content
- ///
- ///
- /// Saves content
- ///
- /// saveMethod)
- {
- //If we've reached here it means:
- // * Our model has been bound
- // * and validated
- // * any file attachments have been saved to their temporary location for us to use
- // * we have a reference to the DTO object and the persisted object
- // * Permissions are valid
- MapPropertyValues(contentItem);
-
- //We need to manually check the validation results here because:
- // * We still need to save the entity even if there are validation value errors
- // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null)
- // then we cannot continue saving, we can only display errors
- // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display
- // a message indicating this
- if (ModelState.IsValid == false)
- {
- if (!RequiredForPersistenceAttribute.HasRequiredValuesForPersistence(contentItem) && IsCreatingAction(contentItem.Action))
- {
- //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
- // add the modelstate to the outgoing object and throw a validation message
- var forDisplay = MapToDisplay(contentItem.PersistedContent, contentItem.Culture);
- forDisplay.Errors = ModelState.ToErrorDictionary();
- throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
-
- }
-
- //if the model state is not valid we cannot publish so change it to save
- switch (contentItem.Action)
- {
- case ContentSaveAction.Publish:
- contentItem.Action = ContentSaveAction.Save;
- break;
- case ContentSaveAction.PublishNew:
- contentItem.Action = ContentSaveAction.SaveNew;
- break;
- }
- }
-
- //initialize this to successful
- var publishStatus = new PublishResult(null, contentItem.PersistedContent);
- var wasCancelled = false;
-
- if (contentItem.Action == ContentSaveAction.Save || contentItem.Action == ContentSaveAction.SaveNew)
- {
- //save the item
- var saveResult = saveMethod(contentItem.PersistedContent);
-
- wasCancelled = saveResult.Success == false && saveResult.Result == OperationResultType.FailedCancelledByEvent;
- }
- else if (contentItem.Action == ContentSaveAction.SendPublish || contentItem.Action == ContentSaveAction.SendPublishNew)
- {
- var sendResult = Services.ContentService.SendToPublication(contentItem.PersistedContent, Security.CurrentUser.Id);
- wasCancelled = sendResult == false;
- }
- else
- {
- PublishInternal(contentItem, ref publishStatus, ref wasCancelled);
- }
-
- //get the updated model
- var display = MapToDisplay(contentItem.PersistedContent, contentItem.Culture);
-
- //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
- HandleInvalidModelState(display);
-
- //put the correct msgs in
- switch (contentItem.Action)
- {
- case ContentSaveAction.Save:
- case ContentSaveAction.SaveNew:
- if (wasCancelled == false)
- {
- display.AddSuccessNotification(
- Services.TextService.Localize("speechBubbles/editContentSavedHeader"),
- Services.TextService.Localize("speechBubbles/editContentSavedText"));
- }
- else
- {
- AddCancelMessage(display);
- }
- break;
- case ContentSaveAction.SendPublish:
- case ContentSaveAction.SendPublishNew:
- if (wasCancelled == false)
- {
- display.AddSuccessNotification(
- Services.TextService.Localize("speechBubbles/editContentSendToPublish"),
- Services.TextService.Localize("speechBubbles/editContentSendToPublishText"));
- }
- else
- {
- AddCancelMessage(display);
- }
- break;
- case ContentSaveAction.Publish:
- case ContentSaveAction.PublishNew:
- ShowMessageForPublishStatus(publishStatus, display);
- break;
- }
-
- //If the item is new and the operation was cancelled, we need to return a different
- // status code so the UI can handle it since it won't be able to redirect since there
- // is no Id to redirect to!
- if (wasCancelled && IsCreatingAction(contentItem.Action))
- {
- throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
- }
-
- display.PersistedContent = contentItem.PersistedContent;
-
- return display;
- }
-
- ///
- /// Performs the publishing operation for a content item
- ///
- ///
- /// If this is a culture variant than we need to do some validation, if it's not we'll publish as normal
- ///
- private void PublishInternal(ContentItemSave contentItem, ref PublishResult publishStatus, ref bool wasCancelled)
- {
- if (!contentItem.PersistedContent.ContentType.VariesByCulture())
- {
- //its invariant, proceed normally
- publishStatus = Services.ContentService.SaveAndPublish(contentItem.PersistedContent, userId: Security.CurrentUser.Id);
- wasCancelled = publishStatus.Result == PublishResultType.FailedCancelledByEvent;
- }
- else
- {
- var canPublish = true;
-
- //check if we are publishing other variants and validate them
- var allLangs = Services.LocalizationService.GetAllLanguages().ToDictionary(x => x.IsoCode, x => x, StringComparer.InvariantCultureIgnoreCase);
- var otherVariantsToValidate = contentItem.PublishVariations.Where(x => !x.Culture.InvariantEquals(contentItem.Culture)).ToList();
-
- //validate any mandatory variants that are not in the list
- var mandatoryLangs = Mapper.Map, IEnumerable>(allLangs.Values)
- .Where(x => otherVariantsToValidate.All(v => !v.Culture.InvariantEquals(x.IsoCode))) //don't include variants above
- .Where(x => !x.IsoCode.InvariantEquals(contentItem.Culture)) //don't include the current variant
- .Where(x => x.Mandatory);
- foreach (var lang in mandatoryLangs)
- {
- //cannot continue publishing since a required language that is not currently being published isn't published
- if (!contentItem.PersistedContent.IsCulturePublished(lang.IsoCode))
- {
- var errMsg = Services.TextService.Localize("speechBubbles/contentReqCulturePublishError", new[] { allLangs[lang.IsoCode].CultureName });
- ModelState.AddModelError("publish_variant_" + lang.IsoCode + "_", errMsg);
- canPublish = false;
- }
- }
-
- if (canPublish)
- {
- //validate all other variants to be published
- foreach (var publishVariation in otherVariantsToValidate)
- {
- //validate the content item and the culture property values, we don't need to validate any invariant property values here because they will have
- //been validated in the post.
- var valid = contentItem.PersistedContent.IsValid(publishVariation.Culture);
- if (!valid)
- {
- var errMsg = Services.TextService.Localize("speechBubbles/contentCultureValidationError", new[] { allLangs[publishVariation.Culture].CultureName });
- ModelState.AddModelError("publish_variant_" + publishVariation.Culture + "_", errMsg);
- canPublish = false;
- }
- }
- }
-
- if (canPublish)
- {
- //try to publish all the values on the model
- canPublish = PublishCulture(contentItem, otherVariantsToValidate, allLangs);
- }
-
- if (canPublish)
- {
- //proceed to publish if all validation still succeeds
- publishStatus = Services.ContentService.SavePublishing(contentItem.PersistedContent, Security.CurrentUser.Id);
- wasCancelled = publishStatus.Result == PublishResultType.FailedCancelledByEvent;
- }
- else
- {
- //can only save
- var saveResult = Services.ContentService.Save(contentItem.PersistedContent, Security.CurrentUser.Id);
- publishStatus = new PublishResult(PublishResultType.FailedCannotPublish, null, contentItem.PersistedContent);
- wasCancelled = saveResult.Result == OperationResultType.FailedCancelledByEvent;
- }
- }
- }
-
- ///
- /// This will call TryPublishValues on the content item for each culture that needs to be published including the invariant culture
- ///
- /// otherVariantsToValidate, IDictionary allLangs)
- {
- var culturesToPublish = new List { contentItem.Culture };
- culturesToPublish.AddRange(otherVariantsToValidate.Select(x => x.Culture));
-
- foreach(var culture in culturesToPublish)
- {
- // publishing any culture, implies the invariant culture
- var valid = contentItem.PersistedContent.PublishCulture(culture);
- if (!valid)
- {
- var errMsg = Services.TextService.Localize("speechBubbles/contentCultureUnexpectedValidationError", new[] { allLangs[culture].CultureName });
- ModelState.AddModelError("publish_variant_" + culture + "_", errMsg);
- return false;
- }
- }
-
- return true;
- }
-
- ///
- /// Publishes a document with a given ID
- ///
- ///
- /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
- /// does not have Publish access to this node.
- ///
- ///
- [EnsureUserPermissionForContent("id", 'U')]
- public HttpResponseMessage PostPublishById(int id)
- {
- var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
- if (foundContent == null)
- {
- return HandleContentNotFound(id, false);
- }
-
- var publishResult = Services.ContentService.SavePublishing(foundContent, Security.GetUserId().ResultOr(0));
- if (publishResult.Success == false)
- {
- var notificationModel = new SimpleNotificationModel();
- ShowMessageForPublishStatus(publishResult, notificationModel);
- return Request.CreateValidationErrorResponse(notificationModel);
- }
-
- //return ok
- return Request.CreateResponse(HttpStatusCode.OK);
-
- }
-
- [HttpDelete]
- [HttpPost]
- public HttpResponseMessage DeleteBlueprint(int id)
- {
- var found = Services.ContentService.GetBlueprintById(id);
-
- if (found == null)
- {
- return HandleContentNotFound(id, false);
- }
-
- Services.ContentService.DeleteBlueprint(found);
-
- return Request.CreateResponse(HttpStatusCode.OK);
- }
-
- ///
- /// Moves an item to the recycle bin, if it is already there then it will permanently delete it
- ///
- ///
- /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
- /// does not have Delete access to this node.
- ///
- [EnsureUserPermissionForContent("id", 'D')]
- [HttpDelete]
- [HttpPost]
- public HttpResponseMessage DeleteById(int id)
- {
- var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
-
- if (foundContent == null)
- {
- return HandleContentNotFound(id, false);
- }
-
- //if the current item is in the recycle bin
- if (foundContent.Trashed == false)
- {
- var moveResult = Services.ContentService.MoveToRecycleBin(foundContent, Security.GetUserId().ResultOr(0));
- if (moveResult.Success == false)
- {
- //returning an object of INotificationModel will ensure that any pending
- // notification messages are added to the response.
- return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
- }
- }
- else
- {
- var deleteResult = Services.ContentService.Delete(foundContent, Security.GetUserId().ResultOr(0));
- if (deleteResult.Success == false)
- {
- //returning an object of INotificationModel will ensure that any pending
- // notification messages are added to the response.
- return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
- }
- }
-
- return Request.CreateResponse(HttpStatusCode.OK);
- }
-
- ///
- /// Empties the recycle bin
- ///
- ///
- /// attributed with EnsureUserPermissionForContent to verify the user has access to the recycle bin
- ///
- [HttpDelete]
- [HttpPost]
- [EnsureUserPermissionForContent(Constants.System.RecycleBinContent)]
- public HttpResponseMessage EmptyRecycleBin()
- {
- Services.ContentService.EmptyRecycleBin();
-
- return Request.CreateNotificationSuccessResponse(Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty"));
- }
-
- ///
- /// Change the sort order for content
- ///
- /// ("Content sorting failed, this was probably caused by an event being cancelled");
- return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");
- }
- return Request.CreateResponse(HttpStatusCode.OK);
- }
- catch (Exception ex)
- {
- Logger.Error("Could not update content sort order", ex);
- throw;
- }
- }
-
- ///
- /// Change the sort order for media
- ///
- ///
- /// Copies a content item and places the copy as a child of a given parent Id
- ///
- ///
- /// Unpublishes a node with a given Id and returns the unpublished entity
- ///
- /// ();
-
- // create or update domains in the model
- foreach (var domainModel in model.Domains.Where(m => string.IsNullOrWhiteSpace(m.Name) == false))
- {
- language = languages.FirstOrDefault(l => l.Id == domainModel.Lang);
- if (language == null)
- {
- continue;
- }
-
- var name = domainModel.Name.ToLowerInvariant();
- if (names.Contains(name))
- {
- domainModel.Duplicate = true;
- continue;
- }
- names.Add(name);
- var domain = domains.FirstOrDefault(d => d.DomainName.InvariantEquals(domainModel.Name));
- if (domain != null)
- {
- domain.LanguageId = language.Id;
- Services.DomainService.Save(domain);
- }
- else if (Services.DomainService.Exists(domainModel.Name))
- {
- domainModel.Duplicate = true;
- var xdomain = Services.DomainService.GetByName(domainModel.Name);
- var xrcid = xdomain.RootContentId;
- if (xrcid.HasValue)
- {
- var xcontent = Services.ContentService.GetById(xrcid.Value);
- var xnames = new List();
- while (xcontent != null)
- {
- xnames.Add(xcontent.Name);
- if (xcontent.ParentId < -1)
- xnames.Add("Recycle Bin");
- xcontent = xcontent.Parent(Services.ContentService);
- }
- xnames.Reverse();
- domainModel.Other = "/" + string.Join("/", xnames);
- }
- }
- else
- {
- // yet there is a race condition here...
- var newDomain = new UmbracoDomain(name)
- {
- LanguageId = domainModel.Lang,
- RootContentId = model.NodeId
- };
- var saveAttempt = Services.DomainService.Save(newDomain);
- if (saveAttempt == false)
- {
- var response = Request.CreateResponse(HttpStatusCode.BadRequest);
- response.Content = new StringContent("Saving new domain failed");
- response.ReasonPhrase = saveAttempt.Result.Result.ToString();
- throw new HttpResponseException(response);
- }
- }
- }
-
- model.Valid = model.Domains.All(m => m.Duplicate == false);
-
- return model;
- }
-
- ///
- /// Maps the dto property values to the persisted model
- ///
- /// ("No template exists with the specified alias: " + contentItem.TemplateAlias);
- }
- else
- {
- //NOTE: this could be null if there was a template and the posted template is null, this should remove the assigned template
- contentItem.PersistedContent.Template = template;
- }
- }
-
- bool Varies(Property property) => property.PropertyType.VariesByCulture();
-
- MapPropertyValues(
- contentItem,
- (save, property) => Varies(property) ? property.GetValue(save.Culture) : property.GetValue(), //get prop val
- (save, property, v) => { if (Varies(property)) property.SetValue(v, save.Culture); else property.SetValue(v); }); //set prop val
- }
-
- ///
- /// Ensures the item can be moved/copied to the new location
- ///
- ///
- /// Performs a permissions check for the user to check if it has access to the node based on
- /// start node and/or permissions for the node
- ///
- /// storage,
- IUser user,
- IUserService userService,
- IContentService contentService,
- IEntityService entityService,
- int nodeId,
- char[] permissionsToCheck = null,
- IContent contentItem = null)
- {
- if (storage == null) throw new ArgumentNullException("storage");
- if (user == null) throw new ArgumentNullException("user");
- if (userService == null) throw new ArgumentNullException("userService");
- if (contentService == null) throw new ArgumentNullException("contentService");
- if (entityService == null) throw new ArgumentNullException("entityService");
-
- if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
- {
- contentItem = contentService.GetById(nodeId);
- //put the content item into storage so it can be retreived
- // in the controller (saves a lookup)
- storage[typeof(IContent).ToString()] = contentItem;
- }
-
- if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
- {
- throw new HttpResponseException(HttpStatusCode.NotFound);
- }
-
- var hasPathAccess = (nodeId == Constants.System.Root)
- ? user.HasContentRootAccess(entityService)
- : (nodeId == Constants.System.RecycleBinContent)
- ? user.HasContentBinAccess(entityService)
- : user.HasPathAccess(contentItem, entityService);
-
- if (hasPathAccess == false)
- {
- return false;
- }
-
- if (permissionsToCheck == null || permissionsToCheck.Length == 0)
- {
- return true;
- }
-
- //get the implicit/inherited permissions for the user for this path,
- //if there is no content item for this id, than just use the id as the path (i.e. -1 or -20)
- var path = contentItem != null ? contentItem.Path : nodeId.ToString();
- var permission = userService.GetPermissionsForPath(user, path);
-
- var allowed = true;
- foreach (var p in permissionsToCheck)
- {
- if (permission == null
- || permission.GetAllPermissions().Contains(p.ToString(CultureInfo.InvariantCulture)) == false)
- {
- allowed = false;
- }
- }
- return allowed;
- }
-
- ///
- /// Used to map an
- /// (content,
- new Dictionary { { ContextMapper.CultureKey, culture } });
-
- return display;
- }
- }
-}
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Web.Http;
+using System.Web.Http.Controllers;
+using System.Web.Http.ModelBinding;
+using AutoMapper;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.Membership;
+using Umbraco.Core.Persistence.DatabaseModelDefinitions;
+using Umbraco.Core.Services;
+using Umbraco.Web.Models.ContentEditing;
+using Umbraco.Web.Models.Mapping;
+using Umbraco.Web.Mvc;
+using Umbraco.Web.WebApi;
+using Umbraco.Web.WebApi.Binders;
+using Umbraco.Web.WebApi.Filters;
+using Umbraco.Core.Persistence.Querying;
+using Umbraco.Web.PublishedCache;
+using Umbraco.Core.Events;
+using Umbraco.Core.Models.Validation;
+using Umbraco.Web.Models;
+using Umbraco.Web.WebServices;
+using Umbraco.Web._Legacy.Actions;
+using Constants = Umbraco.Core.Constants;
+using ContentVariation = Umbraco.Core.Models.ContentVariation;
+using Language = Umbraco.Web.Models.ContentEditing.Language;
+
+namespace Umbraco.Web.Editors
+{
+ ///
+ /// The API controller used for editing content
+ ///
+ ///
+ /// This controller is decorated with the UmbracoApplicationAuthorizeAttribute which means that any user requesting
+ /// access to ALL of the methods on this controller will need access to the content application.
+ ///
+ [PluginController("UmbracoApi")]
+ [UmbracoApplicationAuthorize(Constants.Applications.Content)]
+ [ContentControllerConfiguration]
+ public class ContentController : ContentControllerBase
+ {
+ private readonly IPublishedSnapshotService _publishedSnapshotService;
+
+ public ContentController(IPublishedSnapshotService publishedSnapshotService)
+ {
+ if (publishedSnapshotService == null) throw new ArgumentNullException(nameof(publishedSnapshotService));
+ _publishedSnapshotService = publishedSnapshotService;
+ }
+
+ ///
+ /// Configures this controller with a custom action selector
+ ///
+ private class ContentControllerConfigurationAttribute : Attribute, IControllerConfiguration
+ {
+ public void Initialize(HttpControllerSettings controllerSettings, HttpControllerDescriptor controllerDescriptor)
+ {
+ controllerSettings.Services.Replace(typeof(IHttpActionSelector), new ParameterSwapControllerActionSelector(
+ new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetNiceUrl", "id", typeof(int), typeof(Guid), typeof(Udi)),
+ new ParameterSwapControllerActionSelector.ParameterSwapInfo("GetById", "id", typeof(int), typeof(Guid), typeof(Udi))
+ ));
+ }
+ }
+
+ ///
+ /// Returns true if any content types have culture variation enabled
+ ///
+ ///
+ /// Return content for the specified ids
+ ///
+ /// ))]
+ public IEnumerable GetByIds([FromUri]int[] ids)
+ {
+ //fixme what about cultures?
+
+ var foundContent = Services.ContentService.GetByIds(ids);
+ return foundContent.Select(x => MapToDisplay(x));
+ }
+
+ ///
+ /// Updates the permissions for a content item for a particular user group
+ ///
+ ///
+ /// Permission check is done for letter 'R' which is for
+ [EnsureUserPermissionForContent("saveModel.ContentId", 'R')]
+ public IEnumerable PostSaveUserGroupPermissions(UserGroupPermissionsSave saveModel)
+ {
+ if (saveModel.ContentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+ //TODO: Should non-admins be alowed to set granular permissions?
+
+ var content = Services.ContentService.GetById(saveModel.ContentId);
+ if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+ //current permissions explicitly assigned to this content item
+ var contentPermissions = Services.ContentService.GetPermissions(content)
+ .ToDictionary(x => x.UserGroupId, x => x);
+
+ var allUserGroups = Services.UserService.GetAllUserGroups().ToArray();
+
+ //loop through each user group
+ foreach (var userGroup in allUserGroups)
+ {
+ //check if there's a permission set posted up for this user group
+ IEnumerable groupPermissions;
+ if (saveModel.AssignedPermissions.TryGetValue(userGroup.Id, out groupPermissions))
+ {
+ //create a string collection of the assigned letters
+ var groupPermissionCodes = groupPermissions.ToArray();
+
+ //check if there are no permissions assigned for this group save model, if that is the case we want to reset the permissions
+ //for this group/node which will go back to the defaults
+ if (groupPermissionCodes.Length == 0)
+ {
+ Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
+ }
+ //check if they are the defaults, if so we should just remove them if they exist since it's more overhead having them stored
+ else if (userGroup.Permissions.UnsortedSequenceEqual(groupPermissionCodes))
+ {
+ //only remove them if they are actually currently assigned
+ if (contentPermissions.ContainsKey(userGroup.Id))
+ {
+ //remove these permissions from this node for this group since the ones being assigned are the same as the defaults
+ Services.UserService.RemoveUserGroupPermissions(userGroup.Id, content.Id);
+ }
+ }
+ //if they are different we need to update, otherwise there's nothing to update
+ else if (contentPermissions.ContainsKey(userGroup.Id) == false || contentPermissions[userGroup.Id].AssignedPermissions.UnsortedSequenceEqual(groupPermissionCodes) == false)
+ {
+
+ Services.UserService.ReplaceUserGroupPermissions(userGroup.Id, groupPermissionCodes.Select(x => x[0]), content.Id);
+ }
+ }
+ }
+
+ return GetDetailedPermissions(content, allUserGroups);
+ }
+
+ ///
+ /// Returns the user group permissions for user groups assigned to this node
+ ///
+ ///
+ /// Permission check is done for letter 'R' which is for
+ [EnsureUserPermissionForContent("contentId", 'R')]
+ public IEnumerable GetDetailedPermissions(int contentId)
+ {
+ if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+ var content = Services.ContentService.GetById(contentId);
+ if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
+
+ //TODO: Should non-admins be able to see detailed permissions?
+
+ var allUserGroups = Services.UserService.GetAllUserGroups();
+
+ return GetDetailedPermissions(content, allUserGroups);
+ }
+
+ private IEnumerable GetDetailedPermissions(IContent content, IEnumerable allUserGroups)
+ {
+ //get all user groups and map their default permissions to the AssignedUserGroupPermissions model.
+ //we do this because not all groups will have true assigned permissions for this node so if they don't have assigned permissions, we need to show the defaults.
+
+ var defaultPermissionsByGroup = Mapper.Map>(allUserGroups).ToArray();
+
+ var defaultPermissionsAsDictionary = defaultPermissionsByGroup
+ .ToDictionary(x => Convert.ToInt32(x.Id), x => x);
+
+ //get the actual assigned permissions
+ var assignedPermissionsByGroup = Services.ContentService.GetPermissions(content).ToArray();
+
+ //iterate over assigned and update the defaults with the real values
+ foreach (var assignedGroupPermission in assignedPermissionsByGroup)
+ {
+ var defaultUserGroupPermissions = defaultPermissionsAsDictionary[assignedGroupPermission.UserGroupId];
+
+ //clone the default permissions model to the assigned ones
+ defaultUserGroupPermissions.AssignedPermissions = AssignedUserGroupPermissions.ClonePermissions(defaultUserGroupPermissions.DefaultPermissions);
+
+ //since there is custom permissions assigned to this node for this group, we need to clear all of the default permissions
+ //and we'll re-check it if it's one of the explicitly assigned ones
+ foreach (var permission in defaultUserGroupPermissions.AssignedPermissions.SelectMany(x => x.Value))
+ {
+ permission.Checked = false;
+ permission.Checked = assignedGroupPermission.AssignedPermissions.Contains(permission.PermissionCode, StringComparer.InvariantCulture);
+ }
+
+ }
+
+ return defaultPermissionsByGroup;
+ }
+
+ ///
+ /// Returns an item to be used to display the recycle bin for content
+ ///
+ ///
+ /// Gets the content json for the content id
+ ///
+ ///
+ /// Gets the content json for the content id
+ ///
+ ///
+ /// Gets the content json for the content id
+ ///
+ ///
+ /// Gets an empty content item for the
+ ///
+ ///
+ /// If this is a container type, we'll remove the umbContainerView tab for a new item since
+ /// it cannot actually list children if it doesn't exist yet.
+ ///
+ [OutgoingEditorModelEvent]
+ public ContentItemDisplay GetEmpty(string contentTypeAlias, int parentId)
+ {
+ var contentType = Services.ContentTypeService.Get(contentTypeAlias);
+ if (contentType == null)
+ {
+ throw new HttpResponseException(HttpStatusCode.NotFound);
+ }
+
+ var emptyContent = Services.ContentService.Create("", parentId, contentType.Alias, Security.GetUserId().ResultOr(0));
+ var mapped = MapToDisplay(emptyContent);
+
+ //remove this tab if it exists: umbContainerView
+ var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
+ mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
+
+ if (contentType.VariesByCulture())
+ {
+ //Remove all variants except for the default since currently the default must be saved before other variants can be edited
+ //TODO: Allow for editing all variants at once ... this will be a future task
+ mapped.Variants = new[] { mapped.Variants.FirstOrDefault(x => x.IsCurrent) };
+ }
+
+ return mapped;
+ }
+
+ [OutgoingEditorModelEvent]
+ public ContentItemDisplay GetEmpty(int blueprintId, int parentId)
+ {
+ var blueprint = Services.ContentService.GetBlueprintById(blueprintId);
+ if (blueprint == null)
+ {
+ throw new HttpResponseException(HttpStatusCode.NotFound);
+ }
+
+ blueprint.Id = 0;
+ blueprint.Name = string.Empty;
+ blueprint.ParentId = parentId;
+
+ var mapped = Mapper.Map(blueprint);
+
+ //remove this tab if it exists: umbContainerView
+ var containerTab = mapped.Tabs.FirstOrDefault(x => x.Alias == Constants.Conventions.PropertyGroups.ListViewGroupName);
+ mapped.Tabs = mapped.Tabs.Except(new[] { containerTab });
+ return mapped;
+ }
+
+ ///
+ /// Gets the Url for a given node ID
+ ///
+ ///
+ /// Gets the Url for a given node ID
+ ///
+ ///
+ /// Gets the Url for a given node ID
+ ///
+ ///
+ /// Gets the children for the content id passed in
+ ///
+ /// >), "Items")]
+ public PagedResult> GetChildren(
+ int id,
+ int pageNumber = 0, //TODO: This should be '1' as it's not the index
+ int pageSize = 0,
+ string orderBy = "SortOrder",
+ Direction orderDirection = Direction.Ascending,
+ bool orderBySystemField = true,
+ string filter = "")
+ {
+ return GetChildren(id, null, pageNumber, pageSize, orderBy, orderDirection, orderBySystemField, filter);
+ }
+
+ ///
+ /// Gets the children for the content id passed in
+ ///
+ /// >), "Items")]
+ public PagedResult> GetChildren(
+ int id,
+ string includeProperties,
+ int pageNumber = 0, //TODO: This should be '1' as it's not the index
+ int pageSize = 0,
+ string orderBy = "SortOrder",
+ Direction orderDirection = Direction.Ascending,
+ bool orderBySystemField = true,
+ string filter = "")
+ {
+ long totalChildren;
+ IContent[] children;
+ if (pageNumber > 0 && pageSize > 0)
+ {
+ IQuery queryFilter = null;
+ if (filter.IsNullOrWhiteSpace() == false)
+ {
+ //add the default text filter
+ queryFilter = SqlContext.Query()
+ .Where(x => x.Name.Contains(filter));
+ }
+
+ children = Services.ContentService
+ .GetPagedChildren(
+ id, (pageNumber - 1), pageSize,
+ out totalChildren,
+ orderBy, orderDirection, orderBySystemField,
+ queryFilter).ToArray();
+ }
+ else
+ {
+ children = Services.ContentService.GetChildren(id).ToArray();
+ totalChildren = children.Length;
+ }
+
+ if (totalChildren == 0)
+ {
+ return new PagedResult>(0, 0, 0);
+ }
+
+ var pagedResult = new PagedResult>(totalChildren, pageNumber, pageSize);
+ pagedResult.Items = children.Select(content =>
+ Mapper.Map>(content,
+ opts =>
+ {
+ // if there's a list of property aliases to map - we will make sure to store this in the mapping context.
+ if (String.IsNullOrWhiteSpace(includeProperties) == false)
+ {
+ opts.Items["IncludeProperties"] = includeProperties.Split(new[] { ", ", "," }, StringSplitOptions.RemoveEmptyEntries);
+ }
+ }));
+
+ return pagedResult;
+ }
+
+ ///
+ /// Returns permissions for all nodes passed in for the current user
+ /// TODO: This should be moved to the CurrentUserController?
+ ///
+ /// GetPermissions(int[] nodeIds)
+ {
+ var permissions = Services.UserService
+ .GetPermissions(Security.CurrentUser, nodeIds);
+
+ var permissionsDictionary = new Dictionary();
+ foreach (var nodeId in nodeIds)
+ {
+ var aggregatePerms = permissions.GetAllPermissions(nodeId).ToArray();
+ permissionsDictionary.Add(nodeId, aggregatePerms);
+ }
+
+ return permissionsDictionary;
+ }
+
+ ///
+ /// Checks a nodes permission for the current user
+ /// TODO: This should be moved to the CurrentUserController?
+ ///
+ ///
+ /// Creates a blueprint from a content item
+ ///
+ ///
+ /// Saves content
+ ///
+ ///
+ /// Saves content
+ ///
+ /// saveMethod)
+ {
+ //If we've reached here it means:
+ // * Our model has been bound
+ // * and validated
+ // * any file attachments have been saved to their temporary location for us to use
+ // * we have a reference to the DTO object and the persisted object
+ // * Permissions are valid
+ MapPropertyValues(contentItem);
+
+ //We need to manually check the validation results here because:
+ // * We still need to save the entity even if there are validation value errors
+ // * Depending on if the entity is new, and if there are non property validation errors (i.e. the name is null)
+ // then we cannot continue saving, we can only display errors
+ // * If there are validation errors and they were attempting to publish, we can only save, NOT publish and display
+ // a message indicating this
+ if (ModelState.IsValid == false)
+ {
+ if (!RequiredForPersistenceAttribute.HasRequiredValuesForPersistence(contentItem) && IsCreatingAction(contentItem.Action))
+ {
+ //ok, so the absolute mandatory data is invalid and it's new, we cannot actually continue!
+ // add the modelstate to the outgoing object and throw a validation message
+ var forDisplay = MapToDisplay(contentItem.PersistedContent, contentItem.Culture);
+ forDisplay.Errors = ModelState.ToErrorDictionary();
+ throw new HttpResponseException(Request.CreateValidationErrorResponse(forDisplay));
+
+ }
+
+ //if the model state is not valid we cannot publish so change it to save
+ switch (contentItem.Action)
+ {
+ case ContentSaveAction.Publish:
+ contentItem.Action = ContentSaveAction.Save;
+ break;
+ case ContentSaveAction.PublishNew:
+ contentItem.Action = ContentSaveAction.SaveNew;
+ break;
+ }
+ }
+
+ //initialize this to successful
+ var publishStatus = new PublishResult(null, contentItem.PersistedContent);
+ var wasCancelled = false;
+
+ if (contentItem.Action == ContentSaveAction.Save || contentItem.Action == ContentSaveAction.SaveNew)
+ {
+ //save the item
+ var saveResult = saveMethod(contentItem.PersistedContent);
+
+ wasCancelled = saveResult.Success == false && saveResult.Result == OperationResultType.FailedCancelledByEvent;
+ }
+ else if (contentItem.Action == ContentSaveAction.SendPublish || contentItem.Action == ContentSaveAction.SendPublishNew)
+ {
+ var sendResult = Services.ContentService.SendToPublication(contentItem.PersistedContent, Security.CurrentUser.Id);
+ wasCancelled = sendResult == false;
+ }
+ else
+ {
+ PublishInternal(contentItem, ref publishStatus, ref wasCancelled);
+ }
+
+ //get the updated model
+ var display = MapToDisplay(contentItem.PersistedContent, contentItem.Culture);
+
+ //lasty, if it is not valid, add the modelstate to the outgoing object and throw a 403
+ HandleInvalidModelState(display);
+
+ //put the correct msgs in
+ switch (contentItem.Action)
+ {
+ case ContentSaveAction.Save:
+ case ContentSaveAction.SaveNew:
+ if (wasCancelled == false)
+ {
+ display.AddSuccessNotification(
+ Services.TextService.Localize("speechBubbles/editContentSavedHeader"),
+ Services.TextService.Localize("speechBubbles/editContentSavedText"));
+ }
+ else
+ {
+ AddCancelMessage(display);
+ }
+ break;
+ case ContentSaveAction.SendPublish:
+ case ContentSaveAction.SendPublishNew:
+ if (wasCancelled == false)
+ {
+ display.AddSuccessNotification(
+ Services.TextService.Localize("speechBubbles/editContentSendToPublish"),
+ Services.TextService.Localize("speechBubbles/editContentSendToPublishText"));
+ }
+ else
+ {
+ AddCancelMessage(display);
+ }
+ break;
+ case ContentSaveAction.Publish:
+ case ContentSaveAction.PublishNew:
+ ShowMessageForPublishStatus(publishStatus, display);
+ break;
+ }
+
+ //If the item is new and the operation was cancelled, we need to return a different
+ // status code so the UI can handle it since it won't be able to redirect since there
+ // is no Id to redirect to!
+ if (wasCancelled && IsCreatingAction(contentItem.Action))
+ {
+ throw new HttpResponseException(Request.CreateValidationErrorResponse(display));
+ }
+
+ display.PersistedContent = contentItem.PersistedContent;
+
+ return display;
+ }
+
+ ///
+ /// Performs the publishing operation for a content item
+ ///
+ ///
+ /// If this is a culture variant than we need to do some validation, if it's not we'll publish as normal
+ ///
+ private void PublishInternal(ContentItemSave contentItem, ref PublishResult publishStatus, ref bool wasCancelled)
+ {
+ if (!contentItem.PersistedContent.ContentType.VariesByCulture())
+ {
+ //its invariant, proceed normally
+ publishStatus = Services.ContentService.SaveAndPublish(contentItem.PersistedContent, userId: Security.CurrentUser.Id);
+ wasCancelled = publishStatus.Result == PublishResultType.FailedCancelledByEvent;
+ }
+ else
+ {
+ var canPublish = true;
+
+ //check if we are publishing other variants and validate them
+ var allLangs = Services.LocalizationService.GetAllLanguages().ToDictionary(x => x.IsoCode, x => x, StringComparer.InvariantCultureIgnoreCase);
+ var otherVariantsToValidate = contentItem.PublishVariations.Where(x => !x.Culture.InvariantEquals(contentItem.Culture)).ToList();
+
+ //validate any mandatory variants that are not in the list
+ var mandatoryLangs = Mapper.Map, IEnumerable>(allLangs.Values)
+ .Where(x => otherVariantsToValidate.All(v => !v.Culture.InvariantEquals(x.IsoCode))) //don't include variants above
+ .Where(x => !x.IsoCode.InvariantEquals(contentItem.Culture)) //don't include the current variant
+ .Where(x => x.Mandatory);
+ foreach (var lang in mandatoryLangs)
+ {
+ //cannot continue publishing since a required language that is not currently being published isn't published
+ if (!contentItem.PersistedContent.IsCulturePublished(lang.IsoCode))
+ {
+ var errMsg = Services.TextService.Localize("speechBubbles/contentReqCulturePublishError", new[] { allLangs[lang.IsoCode].CultureName });
+ ModelState.AddModelError("publish_variant_" + lang.IsoCode + "_", errMsg);
+ canPublish = false;
+ }
+ }
+
+ if (canPublish)
+ {
+ //validate all other variants to be published
+ foreach (var publishVariation in otherVariantsToValidate)
+ {
+ //validate the content item and the culture property values, we don't need to validate any invariant property values here because they will have
+ //been validated in the post.
+ var valid = contentItem.PersistedContent.IsValid(publishVariation.Culture);
+ if (!valid)
+ {
+ var errMsg = Services.TextService.Localize("speechBubbles/contentCultureValidationError", new[] { allLangs[publishVariation.Culture].CultureName });
+ ModelState.AddModelError("publish_variant_" + publishVariation.Culture + "_", errMsg);
+ canPublish = false;
+ }
+ }
+ }
+
+ if (canPublish)
+ {
+ //try to publish all the values on the model
+ canPublish = PublishCulture(contentItem, otherVariantsToValidate, allLangs);
+ }
+
+ if (canPublish)
+ {
+ //proceed to publish if all validation still succeeds
+ publishStatus = Services.ContentService.SavePublishing(contentItem.PersistedContent, Security.CurrentUser.Id);
+ wasCancelled = publishStatus.Result == PublishResultType.FailedCancelledByEvent;
+ }
+ else
+ {
+ //can only save
+ var saveResult = Services.ContentService.Save(contentItem.PersistedContent, Security.CurrentUser.Id);
+ publishStatus = new PublishResult(PublishResultType.FailedCannotPublish, null, contentItem.PersistedContent);
+ wasCancelled = saveResult.Result == OperationResultType.FailedCancelledByEvent;
+ }
+ }
+ }
+
+ ///
+ /// This will call TryPublishValues on the content item for each culture that needs to be published including the invariant culture
+ ///
+ /// otherVariantsToValidate, IDictionary allLangs)
+ {
+ var culturesToPublish = new List { contentItem.Culture };
+ culturesToPublish.AddRange(otherVariantsToValidate.Select(x => x.Culture));
+
+ foreach(var culture in culturesToPublish)
+ {
+ // publishing any culture, implies the invariant culture
+ var valid = contentItem.PersistedContent.PublishCulture(culture);
+ if (!valid)
+ {
+ var errMsg = Services.TextService.Localize("speechBubbles/contentCultureUnexpectedValidationError", new[] { allLangs[culture].CultureName });
+ ModelState.AddModelError("publish_variant_" + culture + "_", errMsg);
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ ///
+ /// Publishes a document with a given ID
+ ///
+ ///
+ /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
+ /// does not have Publish access to this node.
+ ///
+ ///
+ [EnsureUserPermissionForContent("id", 'U')]
+ public HttpResponseMessage PostPublishById(int id)
+ {
+ var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+ if (foundContent == null)
+ {
+ return HandleContentNotFound(id, false);
+ }
+
+ var publishResult = Services.ContentService.SavePublishing(foundContent, Security.GetUserId().ResultOr(0));
+ if (publishResult.Success == false)
+ {
+ var notificationModel = new SimpleNotificationModel();
+ ShowMessageForPublishStatus(publishResult, notificationModel);
+ return Request.CreateValidationErrorResponse(notificationModel);
+ }
+
+ //return ok
+ return Request.CreateResponse(HttpStatusCode.OK);
+
+ }
+
+ [HttpDelete]
+ [HttpPost]
+ public HttpResponseMessage DeleteBlueprint(int id)
+ {
+ var found = Services.ContentService.GetBlueprintById(id);
+
+ if (found == null)
+ {
+ return HandleContentNotFound(id, false);
+ }
+
+ Services.ContentService.DeleteBlueprint(found);
+
+ return Request.CreateResponse(HttpStatusCode.OK);
+ }
+
+ ///
+ /// Moves an item to the recycle bin, if it is already there then it will permanently delete it
+ ///
+ ///
+ /// The CanAccessContentAuthorize attribute will deny access to this method if the current user
+ /// does not have Delete access to this node.
+ ///
+ [EnsureUserPermissionForContent("id", 'D')]
+ [HttpDelete]
+ [HttpPost]
+ public HttpResponseMessage DeleteById(int id)
+ {
+ var foundContent = GetObjectFromRequest(() => Services.ContentService.GetById(id));
+
+ if (foundContent == null)
+ {
+ return HandleContentNotFound(id, false);
+ }
+
+ //if the current item is in the recycle bin
+ if (foundContent.Trashed == false)
+ {
+ var moveResult = Services.ContentService.MoveToRecycleBin(foundContent, Security.GetUserId().ResultOr(0));
+ if (moveResult.Success == false)
+ {
+ //returning an object of INotificationModel will ensure that any pending
+ // notification messages are added to the response.
+ return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+ }
+ }
+ else
+ {
+ var deleteResult = Services.ContentService.Delete(foundContent, Security.GetUserId().ResultOr(0));
+ if (deleteResult.Success == false)
+ {
+ //returning an object of INotificationModel will ensure that any pending
+ // notification messages are added to the response.
+ return Request.CreateValidationErrorResponse(new SimpleNotificationModel());
+ }
+ }
+
+ return Request.CreateResponse(HttpStatusCode.OK);
+ }
+
+ ///
+ /// Empties the recycle bin
+ ///
+ ///
+ /// attributed with EnsureUserPermissionForContent to verify the user has access to the recycle bin
+ ///
+ [HttpDelete]
+ [HttpPost]
+ [EnsureUserPermissionForContent(Constants.System.RecycleBinContent)]
+ public HttpResponseMessage EmptyRecycleBin()
+ {
+ Services.ContentService.EmptyRecycleBin();
+
+ return Request.CreateNotificationSuccessResponse(Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty"));
+ }
+
+ ///
+ /// Change the sort order for content
+ ///
+ /// ("Content sorting failed, this was probably caused by an event being cancelled");
+ return Request.CreateValidationErrorResponse("Content sorting failed, this was probably caused by an event being cancelled");
+ }
+ return Request.CreateResponse(HttpStatusCode.OK);
+ }
+ catch (Exception ex)
+ {
+ Logger.Error("Could not update content sort order", ex);
+ throw;
+ }
+ }
+
+ ///
+ /// Change the sort order for media
+ ///
+ ///
+ /// Copies a content item and places the copy as a child of a given parent Id
+ ///
+ ///
+ /// Unpublishes a node with a given Id and returns the unpublished entity
+ ///
+ /// ();
+
+ // create or update domains in the model
+ foreach (var domainModel in model.Domains.Where(m => string.IsNullOrWhiteSpace(m.Name) == false))
+ {
+ language = languages.FirstOrDefault(l => l.Id == domainModel.Lang);
+ if (language == null)
+ {
+ continue;
+ }
+
+ var name = domainModel.Name.ToLowerInvariant();
+ if (names.Contains(name))
+ {
+ domainModel.Duplicate = true;
+ continue;
+ }
+ names.Add(name);
+ var domain = domains.FirstOrDefault(d => d.DomainName.InvariantEquals(domainModel.Name));
+ if (domain != null)
+ {
+ domain.LanguageId = language.Id;
+ Services.DomainService.Save(domain);
+ }
+ else if (Services.DomainService.Exists(domainModel.Name))
+ {
+ domainModel.Duplicate = true;
+ var xdomain = Services.DomainService.GetByName(domainModel.Name);
+ var xrcid = xdomain.RootContentId;
+ if (xrcid.HasValue)
+ {
+ var xcontent = Services.ContentService.GetById(xrcid.Value);
+ var xnames = new List();
+ while (xcontent != null)
+ {
+ xnames.Add(xcontent.Name);
+ if (xcontent.ParentId < -1)
+ xnames.Add("Recycle Bin");
+ xcontent = xcontent.Parent(Services.ContentService);
+ }
+ xnames.Reverse();
+ domainModel.Other = "/" + string.Join("/", xnames);
+ }
+ }
+ else
+ {
+ // yet there is a race condition here...
+ var newDomain = new UmbracoDomain(name)
+ {
+ LanguageId = domainModel.Lang,
+ RootContentId = model.NodeId
+ };
+ var saveAttempt = Services.DomainService.Save(newDomain);
+ if (saveAttempt == false)
+ {
+ var response = Request.CreateResponse(HttpStatusCode.BadRequest);
+ response.Content = new StringContent("Saving new domain failed");
+ response.ReasonPhrase = saveAttempt.Result.Result.ToString();
+ throw new HttpResponseException(response);
+ }
+ }
+ }
+
+ model.Valid = model.Domains.All(m => m.Duplicate == false);
+
+ return model;
+ }
+
+ ///
+ /// Maps the dto property values to the persisted model
+ ///
+ /// ("No template exists with the specified alias: " + contentItem.TemplateAlias);
+ }
+ else
+ {
+ //NOTE: this could be null if there was a template and the posted template is null, this should remove the assigned template
+ contentItem.PersistedContent.Template = template;
+ }
+ }
+
+ bool Varies(Property property) => property.PropertyType.VariesByCulture();
+
+ MapPropertyValues(
+ contentItem,
+ (save, property) => Varies(property) ? property.GetValue(save.Culture) : property.GetValue(), //get prop val
+ (save, property, v) => { if (Varies(property)) property.SetValue(v, save.Culture); else property.SetValue(v); }); //set prop val
+ }
+
+ ///
+ /// Ensures the item can be moved/copied to the new location
+ ///
+ ///
+ /// Performs a permissions check for the user to check if it has access to the node based on
+ /// start node and/or permissions for the node
+ ///
+ /// storage,
+ IUser user,
+ IUserService userService,
+ IContentService contentService,
+ IEntityService entityService,
+ int nodeId,
+ char[] permissionsToCheck = null,
+ IContent contentItem = null)
+ {
+ if (storage == null) throw new ArgumentNullException("storage");
+ if (user == null) throw new ArgumentNullException("user");
+ if (userService == null) throw new ArgumentNullException("userService");
+ if (contentService == null) throw new ArgumentNullException("contentService");
+ if (entityService == null) throw new ArgumentNullException("entityService");
+
+ if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
+ {
+ contentItem = contentService.GetById(nodeId);
+ //put the content item into storage so it can be retreived
+ // in the controller (saves a lookup)
+ storage[typeof(IContent).ToString()] = contentItem;
+ }
+
+ if (contentItem == null && nodeId != Constants.System.Root && nodeId != Constants.System.RecycleBinContent)
+ {
+ throw new HttpResponseException(HttpStatusCode.NotFound);
+ }
+
+ var hasPathAccess = (nodeId == Constants.System.Root)
+ ? user.HasContentRootAccess(entityService)
+ : (nodeId == Constants.System.RecycleBinContent)
+ ? user.HasContentBinAccess(entityService)
+ : user.HasPathAccess(contentItem, entityService);
+
+ if (hasPathAccess == false)
+ {
+ return false;
+ }
+
+ if (permissionsToCheck == null || permissionsToCheck.Length == 0)
+ {
+ return true;
+ }
+
+ //get the implicit/inherited permissions for the user for this path,
+ //if there is no content item for this id, than just use the id as the path (i.e. -1 or -20)
+ var path = contentItem != null ? contentItem.Path : nodeId.ToString();
+ var permission = userService.GetPermissionsForPath(user, path);
+
+ var allowed = true;
+ foreach (var p in permissionsToCheck)
+ {
+ if (permission == null
+ || permission.GetAllPermissions().Contains(p.ToString(CultureInfo.InvariantCulture)) == false)
+ {
+ allowed = false;
+ }
+ }
+ return allowed;
+ }
+
+ ///
+ /// Used to map an
+ /// (content,
+ new Dictionary { { ContextMapper.CultureKey, culture } });
+
+ return display;
+ }
+ }
+}
diff --git a/src/Umbraco.Web/Editors/ContentTypeController.cs b/src/Umbraco.Web/Editors/ContentTypeController.cs
index 4bd74bcbd3..c864ed8f16 100644
--- a/src/Umbraco.Web/Editors/ContentTypeController.cs
+++ b/src/Umbraco.Web/Editors/ContentTypeController.cs
@@ -275,6 +275,19 @@ namespace Umbraco.Web.Editors
template = tryCreateTemplate.Result.Entity;
}
+ // If the alias has been manually updated before the first save,
+ // make sure to also update the first allowed template, as the
+ // name will come back as a SafeAlias of the document type name,
+ // not as the actual document type alias.
+ // For more info: http://issues.umbraco.org/issue/U4-11059
+ if (ctSave.DefaultTemplate != template.Alias)
+ {
+ var allowedTemplates = ctSave.AllowedTemplates.ToArray();
+ if (allowedTemplates.Any())
+ allowedTemplates[0] = template.Alias;
+ ctSave.AllowedTemplates = allowedTemplates;
+ }
+
//make sure the template alias is set on the default and allowed template so we can map it back
ctSave.DefaultTemplate = template.Alias;
diff --git a/src/Umbraco.Web/Editors/TemplateController.cs b/src/Umbraco.Web/Editors/TemplateController.cs
index dae9cacb4c..74cb2f0167 100644
--- a/src/Umbraco.Web/Editors/TemplateController.cs
+++ b/src/Umbraco.Web/Editors/TemplateController.cs
@@ -184,7 +184,7 @@ namespace Umbraco.Web.Editors
throw new HttpResponseException(HttpStatusCode.NotFound);
}
- var template = Services.FileService.CreateTemplateWithIdentity(display.Name, display.Content, master);
+ var template = Services.FileService.CreateTemplateWithIdentity(display.Alias, display.Content, master);
Mapper.Map(template, display);
}
diff --git a/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs b/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
index 3e29d88d5f..6eb568c6af 100644
--- a/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/Mvc/UrlHelperExtensions.cs
@@ -1,79 +1,79 @@
-using System;
-using System.Web.Mvc;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.IO;
-using Umbraco.Core.Xml;
-
-namespace Umbraco.Web.Mvc
-{
- ///
- /// Extension methods for UrlHelper
- ///
- public static class UrlHelperExtensions
- {
- ///
- /// Utility method for checking for valid proxy urls or redirect urls to prevent Open Redirect security issues
- ///
- /// True if it's an allowed url
- public static bool ValidateProxyUrl(this UrlHelper urlHelper, string url, string callerUrl)
- {
- if (Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute) == false)
- {
- return false;
- }
-
- if (url.StartsWith("//"))
- return false;
-
- Uri requestUri;
- if (Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out requestUri))
- {
- if (string.IsNullOrEmpty(callerUrl) == false)
- {
- Uri localUri;
- if (Uri.TryCreate(callerUrl, UriKind.RelativeOrAbsolute, out localUri))
- {
- // check for local urls
-
- //Cannot start with // since that is not a local url
- if (requestUri.OriginalString.StartsWith("//") == false
- //cannot be non-absolute and also contain the char : since that will indicate a protocol
- && (requestUri.IsAbsoluteUri == false && requestUri.OriginalString.Contains(":") == false)
- //needs to be non-absolute or the hosts must match the current request
- && (requestUri.IsAbsoluteUri == false || requestUri.Host == localUri.Host))
- {
- return true;
- }
- }
- else
- {
- return false;
- }
- }
-
- //we cannot continue if the url is not absolute
- if (requestUri.IsAbsoluteUri == false)
- {
- return false;
- }
-
- // check for valid proxy urls
- var feedProxyXml = XmlHelper.OpenAsXmlDocument(IOHelper.MapPath(SystemFiles.FeedProxyConfig));
- if (feedProxyXml != null &&
- feedProxyXml.SelectSingleNode(string.Concat("//allow[@host = '", requestUri.Host, "']")) != null)
- {
- return true;
- }
- }
- else
- {
- return false;
- }
- return false;
- }
- }
-}
+using System;
+using System.Web.Mvc;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.IO;
+using Umbraco.Core.Xml;
+
+namespace Umbraco.Web.Mvc
+{
+ ///
+ /// Extension methods for UrlHelper
+ ///
+ public static class UrlHelperExtensions
+ {
+ ///
+ /// Utility method for checking for valid proxy urls or redirect urls to prevent Open Redirect security issues
+ ///
+ /// True if it's an allowed url
+ public static bool ValidateProxyUrl(this UrlHelper urlHelper, string url, string callerUrl)
+ {
+ if (Uri.IsWellFormedUriString(url, UriKind.RelativeOrAbsolute) == false)
+ {
+ return false;
+ }
+
+ if (url.StartsWith("//"))
+ return false;
+
+ Uri requestUri;
+ if (Uri.TryCreate(url, UriKind.RelativeOrAbsolute, out requestUri))
+ {
+ if (string.IsNullOrEmpty(callerUrl) == false)
+ {
+ Uri localUri;
+ if (Uri.TryCreate(callerUrl, UriKind.RelativeOrAbsolute, out localUri))
+ {
+ // check for local urls
+
+ //Cannot start with // since that is not a local url
+ if (requestUri.OriginalString.StartsWith("//") == false
+ //cannot be non-absolute and also contain the char : since that will indicate a protocol
+ && (requestUri.IsAbsoluteUri == false && requestUri.OriginalString.Contains(":") == false)
+ //needs to be non-absolute or the hosts must match the current request
+ && (requestUri.IsAbsoluteUri == false || requestUri.Host == localUri.Host))
+ {
+ return true;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ //we cannot continue if the url is not absolute
+ if (requestUri.IsAbsoluteUri == false)
+ {
+ return false;
+ }
+
+ // check for valid proxy urls
+ var feedProxyXml = XmlHelper.OpenAsXmlDocument(IOHelper.MapPath(SystemFiles.FeedProxyConfig));
+ if (feedProxyXml != null &&
+ feedProxyXml.SelectSingleNode(string.Concat("//allow[@host = '", requestUri.Host, "']")) != null)
+ {
+ return true;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ return false;
+ }
+ }
+}
diff --git a/src/Umbraco.Web/Properties/Settings1.Designer.cs b/src/Umbraco.Web/Properties/Settings.Designer.cs
similarity index 98%
rename from src/Umbraco.Web/Properties/Settings1.Designer.cs
rename to src/Umbraco.Web/Properties/Settings.Designer.cs
index 2f68c9774c..5a5a863f4f 100644
--- a/src/Umbraco.Web/Properties/Settings1.Designer.cs
+++ b/src/Umbraco.Web/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -44,7 +44,7 @@ namespace Umbraco.Web.Properties {
[global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("Somthing")]
+ [global::System.Configuration.DefaultSettingValueAttribute("Something")]
public string test {
get {
return ((string)(this["test"]));
diff --git a/src/Umbraco.Web/Properties/Settings.settings b/src/Umbraco.Web/Properties/Settings.settings
index d6489e3251..757b363da2 100644
--- a/src/Umbraco.Web/Properties/Settings.settings
+++ b/src/Umbraco.Web/Properties/Settings.settings
@@ -9,7 +9,7 @@
http://update.umbraco.org/checkforupgrade.asmx
- Somthing
+ Something
https://our.umbraco.com/umbraco/webservices/api/repository.asmx
diff --git a/src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs b/src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
deleted file mode 100644
index 60785d283e..0000000000
--- a/src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-
-namespace Umbraco.Web.PropertyEditors
-{
- internal class ColorListPreValueEditor : ValueListPreValueEditor
- {
-
- public ColorListPreValueEditor()
- {
- var field = Fields.First();
-
- //use a custom editor too
- field.View = "views/propertyeditors/colorpicker/colorpicker.prevalues.html";
- //change the description
- field.Description = "Add, remove or sort colors.";
- //change the label
- field.Name = "Colors";
- //need to have some custom validation happening here
- field.Validators.Add(new ColorListValidator());
-
- Fields.Insert(0, new PreValueField
- {
- Name = "Include labels?",
- View = "boolean",
- Key = "useLabel",
- Description = "Stores colors as a Json object containing both the color hex string and label, rather than just the hex string."
- });
- }
-
- public override IDictionary ConvertDbToEditor(IDictionary defaultPreVals, PreValueCollection persistedPreVals)
- {
- var dictionary = persistedPreVals.FormatAsDictionary();
- var items = dictionary.Where(x => x.Key != "useLabel")
- .OrderBy(x => x.Value.SortOrder);
-
- var items2 = new Dictionary();
- foreach (var item in items)
- {
- var valueItem = new ColorPickerColor
- {
- Color = item.Value.Value,
- Label = item.Value.Value,
- SortOrder = item.Value.SortOrder
- };
-
- if (item.Value.Value.DetectIsJson())
- {
- try
- {
- var valueObject = JsonConvert.DeserializeObject(item.Value.Value);
- valueItem = new ColorPickerColor
- {
- Color = valueObject.Color,
- Label = valueObject.Label,
- SortOrder = valueObject.SortOrder
- };
- }
- catch
- {
- // let's say parsing Json failed, we'll not do anything,
- // we'll just use the valueItem we built in the first place
- }
- }
-
- items2[item.Value.Id] = new JObject
- {
- { "value", valueItem.Color },
- { "label", valueItem.Label },
- { "sortOrder", valueItem.SortOrder }
- };
- }
-
- var result = new Dictionary { { "items", items2 } };
- var useLabel = dictionary.ContainsKey("useLabel") && dictionary["useLabel"].Value == "1";
- if (useLabel)
- result["useLabel"] = dictionary["useLabel"].Value;
-
- return result;
- }
-
- public override IDictionary ConvertEditorToDb(IDictionary editorValue, PreValueCollection currentValue)
- {
- var val = editorValue["items"] as JArray;
- var result = new Dictionary();
- if (val == null) return result;
-
- try
- {
- var useLabel = false;
- if (editorValue.TryGetValue("useLabel", out var useLabelObj))
- {
- useLabel = useLabelObj is string && (string) useLabelObj == "1";
- result["useLabel"] = new PreValue(useLabel ? "1" : "0");
- }
-
- // get all non-empty values
- var index = 0;
- // items get submitted in the sorted order, so just count them up
- var sortOrder = -1;
- foreach (var preValue in val.OfType()
- .Where(x => x["value"] != null)
- .Select(x =>
- {
- var idString = x["id"] == null ? "0" : x["id"].ToString();
- int.TryParse(idString, out var id);
-
- var color = x["value"].ToString();
- if (string.IsNullOrWhiteSpace(color)) return null;
-
- var label = x["label"].ToString();
-
- sortOrder++;
- var value = useLabel
- ? JsonConvert.SerializeObject(new { value = color, label = label, sortOrder = sortOrder })
- : color;
-
- return new PreValue(id, value, sortOrder);
- })
- .WhereNotNull())
- {
- result.Add(index.ToInvariantString(), preValue);
- index++;
- }
- }
- catch (Exception ex)
- {
- LogHelper.Error("Could not deserialize the posted value: " + val, ex);
- }
-
- return result;
- }
-
- internal class ColorListValidator : IPropertyValidator
- {
- public IEnumerable Validate(object value, PreValueCollection preValues, PropertyEditor editor)
- {
- var json = value as JArray;
- if (json == null) yield break;
-
- //validate each item which is a json object
- for (var index = 0; index < json.Count; index++)
- {
- var i = json[index];
- var jItem = i as JObject;
- if (jItem == null || jItem["value"] == null) continue;
-
- //NOTE: we will be removing empty values when persisting so no need to validate
- var asString = jItem["value"].ToString();
- if (asString.IsNullOrWhiteSpace()) continue;
-
- if (Regex.IsMatch(asString, "^([0-9a-f]{3}|[0-9a-f]{6})$", RegexOptions.IgnoreCase) == false)
- {
- yield return new ValidationResult("The value " + asString + " is not a valid hex color", new[]
- {
- //we'll make the server field the index number of the value so it can be wired up to the view
- "item_" + index.ToInvariantString()
- });
- }
- }
- }
- }
- }
-
- internal class ColorPickerColor
- {
- [JsonProperty("value")]
- public string Color { get; set; }
- [JsonProperty("label")]
- public string Label { get; set; }
- [JsonProperty("sortOrder")]
- public int SortOrder { get; set; }
- }
-}
diff --git a/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs b/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
index ddc4b50858..cbd4e69a9e 100644
--- a/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/ColorPickerConfigurationEditor.cs
@@ -17,39 +17,85 @@ namespace Umbraco.Web.PropertyEditors
// customize the items field
items.View = "views/propertyeditors/colorpicker/colorpicker.prevalues.html";
- items.Description = "Add and remove colors";
- items.Name = "Add color";
+ items.Description = "Add, remove or sort colors";
+ items.Name = "Colors";
items.Validators.Add(new ColorListValidator());
}
public override Dictionary ToConfigurationEditor(ColorPickerConfiguration configuration)
{
- var items = configuration?.Items.ToDictionary(x => x.Id.ToString(), x => GetItemValue(x, configuration.UseLabel)) ?? new object();
+ var configuredItems = configuration?.Items; // ordered
+ object editorItems;
+
+ if (configuredItems == null)
+ {
+ editorItems = new object();
+ }
+ else
+ {
+ var d = new Dictionary();
+ editorItems = d;
+ var sortOrder = 0;
+ foreach (var item in configuredItems)
+ d[item.Id.ToString()] = GetItemValue(item, configuration.UseLabel, sortOrder++);
+ }
+
var useLabel = configuration?.UseLabel ?? false;
return new Dictionary
{
- { "items", items },
+ { "items", editorItems },
{ "useLabel", useLabel }
};
}
- private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel)
+ private object GetItemValue(ValueListConfiguration.ValueListItem item, bool useLabel, int sortOrder)
{
- if (useLabel)
+ // in: ValueListItem, Id = , Value = | { "value": "", "label": "" }
+ // (depending on useLabel)
+ // out: { "value": "", "label": "", "sortOrder": }
+
+ var v = new ItemValue
{
- return item.Value.DetectIsJson()
- ? JsonConvert.DeserializeObject(item.Value)
- : new JObject { { "color", item.Value }, { "label", item.Value } };
+ Color = item.Value,
+ Label = item.Value,
+ SortOrder = sortOrder
+ };
+
+ if (item.Value.DetectIsJson())
+ {
+ try
+ {
+ var o = JsonConvert.DeserializeObject(item.Value);
+ o.SortOrder = sortOrder;
+ return o;
+ }
+ catch
+ {
+ // parsing Json failed, don't do anything, get the value (sure?)
+ return new ItemValue { Color = item.Value, Label = item.Value, SortOrder = sortOrder };
+ }
}
- if (!item.Value.DetectIsJson())
- return item.Value;
-
- var jobject = (JObject) JsonConvert.DeserializeObject(item.Value);
- return jobject.Property("color").Value.Value();
+ return new ItemValue { Color = item.Value, Label = item.Value, SortOrder = sortOrder };
}
+ // represents an item we are exchanging with the editor
+ private class ItemValue
+ {
+ [JsonProperty("value")]
+ public string Color { get; set; }
+
+ [JsonProperty("label")]
+ public string Label { get; set; }
+
+ [JsonProperty("sortOrder")]
+ public int SortOrder { get; set; }
+ }
+
+ // send: { "items": { "": { "value": "", "label": "", "sortOrder": } , ... }, "useLabel": }
+ // recv: { "items": ..., "useLabel": }
+
public override ColorPickerConfiguration FromConfigurationEditor(IDictionary editorValues, ColorPickerConfiguration configuration)
{
var output = new ColorPickerConfiguration();
@@ -66,9 +112,13 @@ namespace Umbraco.Web.PropertyEditors
if (configuration?.Items != null && configuration.Items.Count > 0)
nextId = configuration.Items.Max(x => x.Id) + 1;
- // create ValueListItem instances - sortOrder is ignored here
+ // create ValueListItem instances - ordered (items get submitted in the sorted order)
foreach (var item in jItems.OfType())
{
+ // in: { "value": "", "id": , "label": "" }
+ // out: ValueListItem, Id = , Value = | { "value": "", "label": "" }
+ // (depending on useLabel)
+
var value = item.Property("value")?.Value?.Value();
if (string.IsNullOrWhiteSpace(value)) continue;
diff --git a/src/Umbraco.Web/PublishedContentExtensions.cs b/src/Umbraco.Web/PublishedContentExtensions.cs
index d33372ce53..5350e05ef9 100644
--- a/src/Umbraco.Web/PublishedContentExtensions.cs
+++ b/src/Umbraco.Web/PublishedContentExtensions.cs
@@ -229,6 +229,17 @@ namespace Umbraco.Web
#endregion
+ #region Variations
+
+ ///
+ /// Determines whether the content has a culture.
+ ///
+ /// Culture is case-insensitive.
+ public static bool HasCulture(this IPublishedContent content, string culture)
+ => content.Cultures.ContainsKey(culture);
+
+ #endregion
+
#region Search
public static IEnumerable Search(this IPublishedContent content, string term, bool useWildCards = true, string indexName = null)
diff --git a/src/Umbraco.Web/Routing/AliasUrlProvider.cs b/src/Umbraco.Web/Routing/AliasUrlProvider.cs
index 900c41e1ff..8c851d139f 100644
--- a/src/Umbraco.Web/Routing/AliasUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/AliasUrlProvider.cs
@@ -54,25 +54,36 @@ namespace Umbraco.Web.Routing
public IEnumerable GetOtherUrls(UmbracoContext umbracoContext, int id, Uri current)
{
var node = umbracoContext.ContentCache.GetById(id);
- if (node == null)
- return Enumerable.Empty();
+ if (node == null) return Enumerable.Empty();
if (!node.HasProperty(Constants.Conventions.Content.UrlAlias))
return Enumerable.Empty();
var domainHelper = umbracoContext.GetDomainHelper(_siteDomainHelper);
+ // look for domains, walking up the tree
var n = node;
var domainUris = domainHelper.DomainsForNode(n.Id, current, false);
while (domainUris == null && n != null) // n is null at root
{
// move to parent node
n = n.Parent;
- domainUris = n == null ? null : domainHelper.DomainsForNode(n.Id, current, false);
+ domainUris = n == null ? null : domainHelper.DomainsForNode(n.Id, current, excludeDefault: false);
}
+ // determine whether the alias property varies
+ var varies = node.GetProperty(Constants.Conventions.Content.UrlAlias).PropertyType.VariesByCulture();
+
if (domainUris == null)
{
+ // no domain
+ // if the property is invariant, then url "/" is ok
+ // if the property varies, then what are we supposed to do?
+ // the content finder may work, depending on the 'current' culture,
+ // but there's no way we can return something meaningful here
+ if (varies)
+ return Enumerable.Empty();
+
var umbracoUrlName = node.Value(Constants.Conventions.Content.UrlAlias);
if (string.IsNullOrWhiteSpace(umbracoUrlName))
return Enumerable.Empty();
@@ -83,10 +94,20 @@ namespace Umbraco.Web.Routing
}
else
{
+ // some domains: one url per domain, which is "/"
var result = new List();
foreach(var domainUri in domainUris)
{
- var umbracoUrlName = node.Value(Constants.Conventions.Content.UrlAlias, culture: domainUri.Culture.Name);
+ // if the property is invariant, get the invariant value, url is "/"
+ // if the property varies, get the variant value, url is "/"
+
+ // but! only if the culture is published, else ignore
+ if (varies && !node.HasCulture(domainUri.Culture.Name)) continue;
+
+ var umbracoUrlName = varies
+ ? node.Value(Constants.Conventions.Content.UrlAlias, culture: domainUri.Culture.Name)
+ : node.Value(Constants.Conventions.Content.UrlAlias);
+
if (!string.IsNullOrWhiteSpace(umbracoUrlName))
{
var path = "/" + umbracoUrlName;
diff --git a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
index 11de879bc8..59e30cc8b0 100644
--- a/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
+++ b/src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
@@ -38,6 +38,7 @@ namespace Umbraco.Web.Routing
{
node = FindContentByAlias(frequest.UmbracoContext.ContentCache,
frequest.HasDomain ? frequest.Domain.ContentId : 0,
+ frequest.Culture.Name,
frequest.Uri.GetAbsolutePathDecoded());
if (node != null)
@@ -50,7 +51,7 @@ namespace Umbraco.Web.Routing
return node != null;
}
- private static IPublishedContent FindContentByAlias(IPublishedContentCache cache, int rootNodeId, string alias)
+ private static IPublishedContent FindContentByAlias(IPublishedContentCache cache, int rootNodeId, string culture, string alias)
{
if (alias == null) throw new ArgumentNullException(nameof(alias));
@@ -62,7 +63,7 @@ namespace Umbraco.Web.Routing
// can we normalize the values so that they contain no whitespaces, and no leading slashes?
// and then the comparisons in IsMatch can be way faster - and allocate way less strings
- const string propertyAlias = "umbracoUrlAlias";
+ const string propertyAlias = Constants.Conventions.Content.UrlAlias;
var test1 = alias.TrimStart('/') + ",";
var test2 = ",/" + test1; // test2 is ",/alias,"
@@ -78,12 +79,26 @@ namespace Umbraco.Web.Routing
// ")]"
if (!c.HasProperty(propertyAlias)) return false;
- var v = c.Value(propertyAlias);
+ var p = c.GetProperty(propertyAlias);
+ var varies = p.PropertyType.VariesByCulture();
+ string v;
+ if (varies)
+ {
+ if (!c.HasCulture(culture)) return false;
+ v = c.Value(propertyAlias, culture);
+ }
+ else
+ {
+ v = c.Value(propertyAlias);
+ }
if (string.IsNullOrWhiteSpace(v)) return false;
v = "," + v.Replace(" ", "") + ",";
return v.Contains(a1) || v.Contains(a2);
}
+ // fixme - even with Linq, what happens below has to be horribly slow
+ // but the only solution is to entirely refactor url providers to stop being dynamic
+
if (rootNodeId > 0)
{
var rootNode = cache.GetById(rootNodeId);
diff --git a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
index 9e89459774..fb9cdfa9bd 100644
--- a/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
+++ b/src/Umbraco.Web/Routing/DefaultUrlProvider.cs
@@ -80,8 +80,11 @@ namespace Umbraco.Web.Routing
public virtual IEnumerable GetOtherUrls(UmbracoContext umbracoContext, int id, Uri current)
{
var node = umbracoContext.ContentCache.GetById(id);
+ if (node == null) return Enumerable.Empty();
+
var domainHelper = umbracoContext.GetDomainHelper(_siteDomainHelper);
+ // look for domains, walking up the tree
var n = node;
var domainUris = domainHelper.DomainsForNode(n.Id, current, false);
while (domainUris == null && n != null) // n is null at root
diff --git a/src/Umbraco.Web/Routing/PublishedRequest.cs b/src/Umbraco.Web/Routing/PublishedRequest.cs
index 1acf794abe..078aef8a54 100644
--- a/src/Umbraco.Web/Routing/PublishedRequest.cs
+++ b/src/Umbraco.Web/Routing/PublishedRequest.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Globalization;
+using System.Threading;
using System.Web;
using umbraco;
using Umbraco.Core.Configuration;
@@ -345,7 +346,7 @@ namespace Umbraco.Web.Routing
///
public CultureInfo Culture
{
- get { return _culture; }
+ get { return _culture ?? Thread.CurrentThread.CurrentCulture; }
set
{
EnsureWriteable();
diff --git a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
index ce09bdc645..b8671b5735 100644
--- a/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
+++ b/src/Umbraco.Web/Routing/UrlProviderExtensions.cs
@@ -110,11 +110,14 @@ namespace Umbraco.Web.Routing
foreach (var (text, infos) in dmsg)
ret.Add(UrlInfo.Message(text, infos.Count == cultures.Count ? null : string.Join(", ", infos.Select(x => x.Culture))));
- // fixme - need to add 'others' urls
- // but, when?
- //// get the 'other' urls
- //foreach(var otherUrl in urlProvider.GetOtherUrls(content.Id))
- // urls.Add(otherUrl);
+ // get the 'other' urls - ie not what you'd get with GetUrl() but urls that would route to the document, nevertheless.
+ // for these 'other' urls, we don't check whether they are routable, collide, anything - we just report them.
+ // also, we are not dealing with cultures at all - that will have to wait
+ foreach(var otherUrl in umbracoContext.UrlProvider.GetOtherUrls(content.Id))
+ {
+ if (urls.Any(x => x.IsUrl && x.Text == otherUrl)) continue;
+ ret.Add(UrlInfo.Url(otherUrl));
+ }
return ret;
}
diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs
index 5553ad00b2..31283acebf 100644
--- a/src/Umbraco.Web/Trees/PackagesTreeController.cs
+++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs
@@ -32,7 +32,6 @@
// return root;
// }
-
// protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings)
// {
// var nodes = new TreeNodeCollection();
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 0da2704c6c..b71750fe2b 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1204,7 +1204,7 @@
Code
-
+
True
True
Settings.settings
@@ -1524,7 +1524,7 @@
SettingsSingleFileGenerator
- Settings1.Designer.cs
+ Settings.Designer.cs
diff --git a/src/Umbraco.Web/UrlHelperExtensions.cs b/src/Umbraco.Web/UrlHelperExtensions.cs
index 98856119c1..9b1c282aab 100644
--- a/src/Umbraco.Web/UrlHelperExtensions.cs
+++ b/src/Umbraco.Web/UrlHelperExtensions.cs
@@ -1,193 +1,193 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Management.Instrumentation;
-using System.Web.Mvc;
-using System.Web.Routing;
-using ClientDependency.Core.Config;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Exceptions;
-using Umbraco.Web.Composing;
-using Umbraco.Web.Editors;
-using Umbraco.Web.Mvc;
-using Umbraco.Web.WebApi;
-using Umbraco.Web.WebServices;
-
-namespace Umbraco.Web
-{
- ///
- /// Extension methods for UrlHelper
- ///
- public static class UrlHelperExtensions
- {
- ///
- /// Returns the base path (not including the 'action') of the MVC controller "ExamineManagementController"
- ///
- /// ("GetIndexerDetails");
- return result.TrimEnd("GetIndexerDetails").EnsureEndsWith('/');
- }
-
- ///
- /// Return the Url for a Web Api service
- ///
- /// (this UrlHelper url, string actionName, RouteValueDictionary routeVals = null)
- where T : UmbracoApiController
- {
- return url.GetUmbracoApiService(actionName, typeof(T), routeVals);
- }
-
- ///
- /// Return the Base Url (not including the action) for a Web Api service
- ///
- /// (this UrlHelper url, string actionName)
- where T : UmbracoApiController
- {
- return url.GetUmbracoApiService(actionName).TrimEnd(actionName);
- }
-
- public static string GetUmbracoApiServiceBaseUrl(this UrlHelper url, Expression> methodSelector)
- where T : UmbracoApiController
- {
- var method = Core.ExpressionHelper.GetMethodInfo(methodSelector);
- if (method == null)
- {
- throw new MissingMethodException("Could not find the method " + methodSelector + " on type " + typeof(T) + " or the result ");
- }
- return url.GetUmbracoApiService(method.Name).TrimEnd(method.Name);
- }
-
- public static string GetUmbracoApiService(this UrlHelper url, Expression> methodSelector)
- where T : UmbracoApiController
- {
- var method = Core.ExpressionHelper.GetMethodInfo(methodSelector);
- if (method == null)
- {
- throw new MissingMethodException("Could not find the method " + methodSelector + " on type " + typeof(T) + " or the result ");
- }
- var parameters = Core.ExpressionHelper.GetMethodParams(methodSelector);
- var routeVals = new RouteValueDictionary(parameters);
- return url.GetUmbracoApiService(method.Name, routeVals);
- }
-
- ///
- /// Return the Url for a Web Api service
- ///
- ///
- /// Return the Url for a Web Api service
- ///
- ///
- /// Return the Url for a Web Api service
- ///
- ///
- /// Return the Url for an action with a cache-busting hash appended
- ///
- ///
- ///
- ///
- ///
+ /// Extension methods for UrlHelper
+ ///
+ public static class UrlHelperExtensions
+ {
+ ///
+ /// Returns the base path (not including the 'action') of the MVC controller "ExamineManagementController"
+ ///
+ /// ("GetIndexerDetails");
+ return result.TrimEnd("GetIndexerDetails").EnsureEndsWith('/');
+ }
+
+ ///
+ /// Return the Url for a Web Api service
+ ///
+ /// (this UrlHelper url, string actionName, RouteValueDictionary routeVals = null)
+ where T : UmbracoApiController
+ {
+ return url.GetUmbracoApiService(actionName, typeof(T), routeVals);
+ }
+
+ ///
+ /// Return the Base Url (not including the action) for a Web Api service
+ ///
+ /// (this UrlHelper url, string actionName)
+ where T : UmbracoApiController
+ {
+ return url.GetUmbracoApiService(actionName).TrimEnd(actionName);
+ }
+
+ public static string GetUmbracoApiServiceBaseUrl(this UrlHelper url, Expression> methodSelector)
+ where T : UmbracoApiController
+ {
+ var method = Core.ExpressionHelper.GetMethodInfo(methodSelector);
+ if (method == null)
+ {
+ throw new MissingMethodException("Could not find the method " + methodSelector + " on type " + typeof(T) + " or the result ");
+ }
+ return url.GetUmbracoApiService(method.Name).TrimEnd(method.Name);
+ }
+
+ public static string GetUmbracoApiService(this UrlHelper url, Expression> methodSelector)
+ where T : UmbracoApiController
+ {
+ var method = Core.ExpressionHelper.GetMethodInfo(methodSelector);
+ if (method == null)
+ {
+ throw new MissingMethodException("Could not find the method " + methodSelector + " on type " + typeof(T) + " or the result ");
+ }
+ var parameters = Core.ExpressionHelper.GetMethodParams(methodSelector);
+ var routeVals = new RouteValueDictionary(parameters);
+ return url.GetUmbracoApiService(method.Name, routeVals);
+ }
+
+ ///
+ /// Return the Url for a Web Api service
+ ///
+ ///
+ /// Return the Url for a Web Api service
+ ///
+ ///
+ /// Return the Url for a Web Api service
+ ///
+ ///
+ /// Return the Url for an action with a cache-busting hash appended
+ ///
+ ///
+ ///
+ ///
+ ///
- /// Client side ajax utlities for the tree
- ///
- [ScriptService]
- [WebService]
- public class CustomTreeService : UmbracoWebService
- {
- ///
- /// Returns some info about the node such as path and id
- ///
- ///
- /// returns the node names for each id passed in
- ///
- ///
- /// Returns a key/value object with: json, app, js as the keys
- ///
- /// GetInitAppTreeData(string app, string treeType, bool showContextMenu, bool isDialog, TreeDialogModes dialogMode, string functionToCall, string nodeKey)
- {
- Authorize();
-
- var treeCtl = new TreeControl()
- {
- ShowContextMenu = showContextMenu,
- IsDialog = isDialog,
- DialogMode = dialogMode,
- App = app,
- TreeType = string.IsNullOrEmpty(treeType) ? "" : treeType, //don't set the tree type unless explicitly set
- NodeKey = string.IsNullOrEmpty(nodeKey) ? "" : nodeKey,
- //StartNodeID = -1, //TODO: set this based on parameters!
- FunctionToCall = string.IsNullOrEmpty(functionToCall) ? "" : functionToCall
- };
-
- var returnVal = new Dictionary();
-
- if (string.IsNullOrEmpty(treeType))
- {
- //if there's not tree type specified, then render out the tree as per normal with the normal
- //way of doing things
- returnVal.Add("json", treeCtl.GetJSONInitNode());
- }
- else
- {
- //since 4.5.1 has a bug in it, it ignores if the treeType is specified and will always only render
- //the whole APP not just a specific tree.
- //this is a work around for this bug until it is fixed (which should be fixed in 4.5.2
-
- //get the tree that we need to render
- var tree = TreeDefinitionCollection.Instance.FindTree(treeType).CreateInstance();
- tree.ShowContextMenu = showContextMenu;
- tree.IsDialog = isDialog;
- tree.DialogMode = dialogMode;
- tree.NodeKey = string.IsNullOrEmpty(nodeKey) ? "" : nodeKey;
- tree.FunctionToCall = string.IsNullOrEmpty(functionToCall) ? "" : functionToCall;
-
- //now render it's start node
- var xTree = new XmlTree();
-
- //we're going to hijack the node name here to make it say content/media
- var node = tree.RootNode;
- if (node.Text.Equals("[FilteredContentTree]")) node.Text = Services.TextService.Localize("content");
- else if (node.Text.Equals("[FilteredMediaTree]")) node.Text = Services.TextService.Localize("media");
- xTree.Add(node);
-
- returnVal.Add("json", xTree.ToString());
- }
-
- returnVal.Add("app", app);
- returnVal.Add("js", treeCtl.JSCurrApp);
-
- return returnVal;
- }
-
- internal void Authorize()
- {
- if (ValidateCurrentUser() == false)
- throw new Exception("Client authorization failed. User is not logged in");
- }
-
-
- ///
- /// Validates the currently logged in user and ensures they are not timed out
- ///
- ///
+ /// Client side ajax utlities for the tree
+ ///
+ [ScriptService]
+ [WebService]
+ public class CustomTreeService : UmbracoWebService
+ {
+ ///
+ /// Returns some info about the node such as path and id
+ ///
+ ///
+ /// returns the node names for each id passed in
+ ///
+ ///
+ /// Returns a key/value object with: json, app, js as the keys
+ ///
+ /// GetInitAppTreeData(string app, string treeType, bool showContextMenu, bool isDialog, TreeDialogModes dialogMode, string functionToCall, string nodeKey)
+ {
+ Authorize();
+
+ var treeCtl = new TreeControl()
+ {
+ ShowContextMenu = showContextMenu,
+ IsDialog = isDialog,
+ DialogMode = dialogMode,
+ App = app,
+ TreeType = string.IsNullOrEmpty(treeType) ? "" : treeType, //don't set the tree type unless explicitly set
+ NodeKey = string.IsNullOrEmpty(nodeKey) ? "" : nodeKey,
+ //StartNodeID = -1, //TODO: set this based on parameters!
+ FunctionToCall = string.IsNullOrEmpty(functionToCall) ? "" : functionToCall
+ };
+
+ var returnVal = new Dictionary();
+
+ if (string.IsNullOrEmpty(treeType))
+ {
+ //if there's not tree type specified, then render out the tree as per normal with the normal
+ //way of doing things
+ returnVal.Add("json", treeCtl.GetJSONInitNode());
+ }
+ else
+ {
+ //since 4.5.1 has a bug in it, it ignores if the treeType is specified and will always only render
+ //the whole APP not just a specific tree.
+ //this is a work around for this bug until it is fixed (which should be fixed in 4.5.2
+
+ //get the tree that we need to render
+ var tree = TreeDefinitionCollection.Instance.FindTree(treeType).CreateInstance();
+ tree.ShowContextMenu = showContextMenu;
+ tree.IsDialog = isDialog;
+ tree.DialogMode = dialogMode;
+ tree.NodeKey = string.IsNullOrEmpty(nodeKey) ? "" : nodeKey;
+ tree.FunctionToCall = string.IsNullOrEmpty(functionToCall) ? "" : functionToCall;
+
+ //now render it's start node
+ var xTree = new XmlTree();
+
+ //we're going to hijack the node name here to make it say content/media
+ var node = tree.RootNode;
+ if (node.Text.Equals("[FilteredContentTree]")) node.Text = Services.TextService.Localize("content");
+ else if (node.Text.Equals("[FilteredMediaTree]")) node.Text = Services.TextService.Localize("media");
+ xTree.Add(node);
+
+ returnVal.Add("json", xTree.ToString());
+ }
+
+ returnVal.Add("app", app);
+ returnVal.Add("js", treeCtl.JSCurrApp);
+
+ return returnVal;
+ }
+
+ internal void Authorize()
+ {
+ if (ValidateCurrentUser() == false)
+ throw new Exception("Client authorization failed. User is not logged in");
+ }
+
+
+ ///
+ /// Validates the currently logged in user and ensures they are not timed out
+ ///
+ /// (action);
- return path.TrimEnd(action).EnsureEndsWith('/');
- }
- }
-}
+using System;
+using System.Text;
+using System.Linq;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Services;
+using Umbraco.Web.UI.Pages;
+using Umbraco.Web;
+using Umbraco.Web.Composing;
+using Umbraco.Web.Editors;
+using Umbraco.Web.WebServices;
+using Umbraco.Web._Legacy.Actions;
+
+
+namespace umbraco.dialogs
+{
+ public partial class AssignDomain2 : UmbracoEnsuredPage
+ {
+ protected override void OnInit(EventArgs e)
+ {
+ base.OnInit(e);
+
+ var nodeId = GetNodeId();
+ CheckPathAndPermissions(nodeId, UmbracoObjectTypes.Document, ActionAssignDomain.Instance);
+ }
+
+ protected override void OnLoad(EventArgs e)
+ {
+ base.OnLoad(e);
+
+ var nodeId = GetNodeId();
+ var node = Services.ContentService.GetById(nodeId);
+
+ if (node == null)
+ {
+ feedback.Text = Services.TextService.Localize("assignDomain/invalidNode");
+ pane_language.Visible = false;
+ pane_domains.Visible = false;
+ p_buttons.Visible = false;
+ return;
+ }
+
+ pane_language.Title = Services.TextService.Localize("assignDomain/setLanguage");
+ pane_domains.Title = Services.TextService.Localize("assignDomain/setDomains");
+ prop_language.Text = Services.TextService.Localize("assignDomain/language");
+
+ var nodeDomains = Services.DomainService.GetAssignedDomains(nodeId, true).ToArray();
+ var wildcard = nodeDomains.FirstOrDefault(d => d.IsWildcard);
+
+ var sb = new StringBuilder();
+ sb.Append("languages: [");
+ var i = 0;
+ foreach (var language in Current.Services.LocalizationService.GetAllLanguages())
+ sb.AppendFormat("{0}{{ \"Id\": {1}, \"Code\": \"{2}\" }}", (i++ == 0 ? "" : ","), language.Id, language.IsoCode);
+ sb.Append("]\r\n");
+
+ sb.AppendFormat(",language: {0}", wildcard == null ? "undefined" : wildcard.LanguageId.ToString());
+
+ sb.Append(",domains: [");
+ i = 0;
+ foreach (var domain in nodeDomains.Where(d => d.IsWildcard == false))
+ sb.AppendFormat("{0}{{ \"Name\": \"{1}\", \"Lang\": \"{2}\" }}", (i++ == 0 ? "" :","), domain.DomainName, domain.LanguageId);
+ sb.Append("]\r\n");
+
+ data.Text = sb.ToString();
+ }
+
+ protected int GetNodeId()
+ {
+ int nodeId;
+ if (int.TryParse(Request.QueryString["id"], out nodeId) == false)
+ nodeId = -1;
+ return nodeId;
+ }
+
+ protected string GetRestServicePath()
+ {
+ const string action = "ListDomains";
+ var path = Url.GetUmbracoApiService(action);
+ return path.TrimEnd(action).EnsureEndsWith('/');
+ }
+ }
+}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
index 95fe3626b6..ca26c5c08d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/nodeSorter.asmx.cs
@@ -1,262 +1,262 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Web.Script.Services;
-using System.Web.Services;
-using Umbraco.Core;
-using Umbraco.Core.Configuration;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Web;
-using Umbraco.Web.Composing;
-using Umbraco.Web._Legacy.Actions;
-
-namespace umbraco.presentation.webservices
-{
- ///
- /// Summary description for nodeSorter
- ///
- [WebService(Namespace = "http://umbraco.org/")]
- [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
- [ToolboxItem(false)]
- [ScriptService]
- public class nodeSorter : UmbracoAuthorizedWebService
- {
- [WebMethod]
- public SortNode GetNodes(string ParentId, string App)
- {
- if (AuthorizeRequest())
- {
- var nodes = new List();
-
- // "hack for stylesheet"
- if (App == "settings")
- {
- var stylesheet = Services.FileService.GetStylesheetByName(ParentId.EnsureEndsWith(".css"));
- if (stylesheet == null) throw new InvalidOperationException("No stylesheet found by name " + ParentId);
-
- var sort = 0;
- foreach (var child in stylesheet.Properties)
- {
- nodes.Add(new SortNode(child.Name.GetHashCode(), sort, child.Name, DateTime.Now));
- sort++;
- }
-
- return new SortNode()
- {
- SortNodes = nodes.ToArray()
- };
- }
- else
- {
- var asInt = int.Parse(ParentId);
-
- var parent = new SortNode { Id = asInt };
-
- var entityService = Services.EntityService;
-
- // Root nodes?
- if (asInt == -1)
- {
- if (App == "media")
- {
- var rootMedia = entityService.GetRootEntities(UmbracoObjectTypes.Media);
- nodes.AddRange(rootMedia.Select(media => new SortNode(media.Id, media.SortOrder, media.Name, media.CreateDate)));
- }
- else
- {
- var rootContent = entityService.GetRootEntities(UmbracoObjectTypes.Document);
- nodes.AddRange(rootContent.Select(content => new SortNode(content.Id, content.SortOrder, content.Name, content.CreateDate)));
- }
- }
- else
- {
- var children = entityService.GetChildren(asInt);
- nodes.AddRange(children.Select(child => new SortNode(child.Id, child.SortOrder, child.Name, child.CreateDate)));
- }
-
-
- parent.SortNodes = nodes.ToArray();
-
- return parent;
- }
- }
-
- throw new ArgumentException("User not logged in");
- }
-
- public void UpdateSortOrder(int ParentId, string SortOrder)
- {
- UpdateSortOrder(ParentId.ToString(), SortOrder);
- }
-
- [WebMethod]
- public void UpdateSortOrder(string ParentId, string SortOrder)
- {
- if (AuthorizeRequest() == false) return;
- if (SortOrder.Trim().Length <= 0) return;
-
- var isContent = Context.Request.GetItemAsString("app") == "content" | Context.Request.GetItemAsString("app") == "";
- var isMedia = Context.Request.GetItemAsString("app") == "media";
-
- //ensure user is authorized for the app requested
- if (isContent && AuthorizeRequest(Constants.Applications.Content.ToString()) == false) return;
- if (isMedia && AuthorizeRequest(Constants.Applications.Media.ToString()) == false) return;
-
- var ids = SortOrder.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
- if (isContent)
- {
- SortContent(ids, int.Parse(ParentId));
- }
- else if (isMedia)
- {
- SortMedia(ids);
- }
- else
- {
- SortStylesheetProperties(ParentId, ids);
- }
- }
-
- private void SortMedia(string[] ids)
- {
- var mediaService = Services.MediaService;
- var sortedMedia = new List();
- try
- {
- for (var i = 0; i < ids.Length; i++)
- {
- var id = int.Parse(ids[i]);
- var m = mediaService.GetById(id);
- sortedMedia.Add(m);
- }
-
- // Save Media with new sort order and update content xml in db accordingly
- var sorted = mediaService.Sort(sortedMedia);
- }
- catch (Exception ex)
- {
- Current.Logger.Error("Could not update media sort order", ex);
- }
- }
-
-
- private void SortStylesheetProperties(string stylesheetName, string[] names)
- {
- var stylesheet = Services.FileService.GetStylesheetByName(stylesheetName.EnsureEndsWith(".css"));
- if (stylesheet == null) throw new InvalidOperationException("No stylesheet found by name " + stylesheetName);
-
- var currProps = stylesheet.Properties.ToArray();
- //remove them all first
- foreach (var prop in currProps)
- {
- stylesheet.RemoveProperty(prop.Name);
- }
-
- //re-add them in the right order
- for (var i = 0; i < names.Length; i++)
- {
- var found = currProps.Single(x => x.Name == names[i]);
- stylesheet.AddProperty(found);
- }
-
- Services.FileService.SaveStylesheet(stylesheet);
- }
-
- private void SortContent(string[] ids, int parentId)
- {
- var contentService = Services.ContentService;
- try
- {
- // Save content with new sort order and update db+cache accordingly
- var intIds = new List();
- foreach (var stringId in ids)
- {
- int intId;
- if (int.TryParse(stringId, out intId))
- intIds.Add(intId);
- }
- var sorted = contentService.Sort(intIds.ToArray());
-
- // refresh sort order on cached xml
- // but no... this is not distributed - solely relying on content service & events should be enough
- //content.Instance.SortNodes(parentId);
-
- //send notifications! TODO: This should be put somewhere centralized instead of hard coded directly here
- if (parentId > 0)
- {
- Services.NotificationService.SendNotification(contentService.GetById(parentId), ActionSort.Instance, UmbracoContext, Services.TextService, GlobalSettings);
- }
-
- }
- catch (Exception ex)
- {
- Current.Logger.Error("Could not update content sort order", ex);
- }
- }
-
- }
-
- [Serializable]
- public class SortNode
- {
- public SortNode()
- {
- }
-
- private SortNode[] _sortNodes;
-
- public SortNode[] SortNodes
- {
- get { return _sortNodes; }
- set { _sortNodes = value; }
- }
-
- public int TotalNodes
- {
- get { return _sortNodes != null ? _sortNodes.Length : 0; }
- set { int test = value; }
- }
-
- public SortNode(int Id, int SortOrder, string Name, DateTime CreateDate)
- {
- _id = Id;
- _sortOrder = SortOrder;
- _name = Name;
- _createDate = CreateDate;
- }
-
- private DateTime _createDate;
-
- public DateTime CreateDate
- {
- get { return _createDate; }
- set { _createDate = value; }
- }
-
- private string _name;
-
- public string Name
- {
- get { return _name; }
- set { _name = value; }
- }
-
- private int _sortOrder;
-
- public int SortOrder
- {
- get { return _sortOrder; }
- set { _sortOrder = value; }
- }
-
- private int _id;
-
- public int Id
- {
- get { return _id; }
- set { _id = value; }
- }
- }
-}
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Web.Script.Services;
+using System.Web.Services;
+using Umbraco.Core;
+using Umbraco.Core.Configuration;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Web;
+using Umbraco.Web.Composing;
+using Umbraco.Web._Legacy.Actions;
+
+namespace umbraco.presentation.webservices
+{
+ ///
+ /// Summary description for nodeSorter
+ ///
+ [WebService(Namespace = "http://umbraco.org/")]
+ [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)]
+ [ToolboxItem(false)]
+ [ScriptService]
+ public class nodeSorter : UmbracoAuthorizedWebService
+ {
+ [WebMethod]
+ public SortNode GetNodes(string ParentId, string App)
+ {
+ if (AuthorizeRequest())
+ {
+ var nodes = new List();
+
+ // "hack for stylesheet"
+ if (App == "settings")
+ {
+ var stylesheet = Services.FileService.GetStylesheetByName(ParentId.EnsureEndsWith(".css"));
+ if (stylesheet == null) throw new InvalidOperationException("No stylesheet found by name " + ParentId);
+
+ var sort = 0;
+ foreach (var child in stylesheet.Properties)
+ {
+ nodes.Add(new SortNode(child.Name.GetHashCode(), sort, child.Name, DateTime.Now));
+ sort++;
+ }
+
+ return new SortNode()
+ {
+ SortNodes = nodes.ToArray()
+ };
+ }
+ else
+ {
+ var asInt = int.Parse(ParentId);
+
+ var parent = new SortNode { Id = asInt };
+
+ var entityService = Services.EntityService;
+
+ // Root nodes?
+ if (asInt == -1)
+ {
+ if (App == "media")
+ {
+ var rootMedia = entityService.GetRootEntities(UmbracoObjectTypes.Media);
+ nodes.AddRange(rootMedia.Select(media => new SortNode(media.Id, media.SortOrder, media.Name, media.CreateDate)));
+ }
+ else
+ {
+ var rootContent = entityService.GetRootEntities(UmbracoObjectTypes.Document);
+ nodes.AddRange(rootContent.Select(content => new SortNode(content.Id, content.SortOrder, content.Name, content.CreateDate)));
+ }
+ }
+ else
+ {
+ var children = entityService.GetChildren(asInt);
+ nodes.AddRange(children.Select(child => new SortNode(child.Id, child.SortOrder, child.Name, child.CreateDate)));
+ }
+
+
+ parent.SortNodes = nodes.ToArray();
+
+ return parent;
+ }
+ }
+
+ throw new ArgumentException("User not logged in");
+ }
+
+ public void UpdateSortOrder(int ParentId, string SortOrder)
+ {
+ UpdateSortOrder(ParentId.ToString(), SortOrder);
+ }
+
+ [WebMethod]
+ public void UpdateSortOrder(string ParentId, string SortOrder)
+ {
+ if (AuthorizeRequest() == false) return;
+ if (SortOrder.Trim().Length <= 0) return;
+
+ var isContent = Context.Request.GetItemAsString("app") == "content" | Context.Request.GetItemAsString("app") == "";
+ var isMedia = Context.Request.GetItemAsString("app") == "media";
+
+ //ensure user is authorized for the app requested
+ if (isContent && AuthorizeRequest(Constants.Applications.Content.ToString()) == false) return;
+ if (isMedia && AuthorizeRequest(Constants.Applications.Media.ToString()) == false) return;
+
+ var ids = SortOrder.Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
+ if (isContent)
+ {
+ SortContent(ids, int.Parse(ParentId));
+ }
+ else if (isMedia)
+ {
+ SortMedia(ids);
+ }
+ else
+ {
+ SortStylesheetProperties(ParentId, ids);
+ }
+ }
+
+ private void SortMedia(string[] ids)
+ {
+ var mediaService = Services.MediaService;
+ var sortedMedia = new List();
+ try
+ {
+ for (var i = 0; i < ids.Length; i++)
+ {
+ var id = int.Parse(ids[i]);
+ var m = mediaService.GetById(id);
+ sortedMedia.Add(m);
+ }
+
+ // Save Media with new sort order and update content xml in db accordingly
+ var sorted = mediaService.Sort(sortedMedia);
+ }
+ catch (Exception ex)
+ {
+ Current.Logger.Error("Could not update media sort order", ex);
+ }
+ }
+
+
+ private void SortStylesheetProperties(string stylesheetName, string[] names)
+ {
+ var stylesheet = Services.FileService.GetStylesheetByName(stylesheetName.EnsureEndsWith(".css"));
+ if (stylesheet == null) throw new InvalidOperationException("No stylesheet found by name " + stylesheetName);
+
+ var currProps = stylesheet.Properties.ToArray();
+ //remove them all first
+ foreach (var prop in currProps)
+ {
+ stylesheet.RemoveProperty(prop.Name);
+ }
+
+ //re-add them in the right order
+ for (var i = 0; i < names.Length; i++)
+ {
+ var found = currProps.Single(x => x.Name == names[i]);
+ stylesheet.AddProperty(found);
+ }
+
+ Services.FileService.SaveStylesheet(stylesheet);
+ }
+
+ private void SortContent(string[] ids, int parentId)
+ {
+ var contentService = Services.ContentService;
+ try
+ {
+ // Save content with new sort order and update db+cache accordingly
+ var intIds = new List();
+ foreach (var stringId in ids)
+ {
+ int intId;
+ if (int.TryParse(stringId, out intId))
+ intIds.Add(intId);
+ }
+ var sorted = contentService.Sort(intIds.ToArray());
+
+ // refresh sort order on cached xml
+ // but no... this is not distributed - solely relying on content service & events should be enough
+ //content.Instance.SortNodes(parentId);
+
+ //send notifications! TODO: This should be put somewhere centralized instead of hard coded directly here
+ if (parentId > 0)
+ {
+ Services.NotificationService.SendNotification(contentService.GetById(parentId), ActionSort.Instance, UmbracoContext, Services.TextService, GlobalSettings);
+ }
+
+ }
+ catch (Exception ex)
+ {
+ Current.Logger.Error("Could not update content sort order", ex);
+ }
+ }
+
+ }
+
+ [Serializable]
+ public class SortNode
+ {
+ public SortNode()
+ {
+ }
+
+ private SortNode[] _sortNodes;
+
+ public SortNode[] SortNodes
+ {
+ get { return _sortNodes; }
+ set { _sortNodes = value; }
+ }
+
+ public int TotalNodes
+ {
+ get { return _sortNodes != null ? _sortNodes.Length : 0; }
+ set { int test = value; }
+ }
+
+ public SortNode(int Id, int SortOrder, string Name, DateTime CreateDate)
+ {
+ _id = Id;
+ _sortOrder = SortOrder;
+ _name = Name;
+ _createDate = CreateDate;
+ }
+
+ private DateTime _createDate;
+
+ public DateTime CreateDate
+ {
+ get { return _createDate; }
+ set { _createDate = value; }
+ }
+
+ private string _name;
+
+ public string Name
+ {
+ get { return _name; }
+ set { _name = value; }
+ }
+
+ private int _sortOrder;
+
+ public int SortOrder
+ {
+ get { return _sortOrder; }
+ set { _sortOrder = value; }
+ }
+
+ private int _id;
+
+ public int Id
+ {
+ get { return _id; }
+ set { _id = value; }
+ }
+ }
+}