From c5f1cc15fdb37c00c4c9460a48e0cf1f1b23df7c Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 3 Jul 2019 08:33:30 +0200 Subject: [PATCH] Refactored `dataTypeId` when a guid into `dataTypeKey` --- .../components/grid/grid.rte.directive.js | 4 +-- .../tree/umbtreesearchbox.directive.js | 6 ++-- .../src/common/resources/entity.resource.js | 20 ++++++------ .../src/common/services/search.service.js | 4 +-- .../src/common/services/tinymce.service.js | 4 +-- .../linkpicker/linkpicker.controller.js | 6 ++-- .../linkpicker/linkpicker.html | 32 +++++++++---------- .../mediapicker/mediapicker.controller.js | 6 ++-- .../treepicker/treepicker.controller.js | 8 ++--- .../treepicker/treepicker.html | 22 ++++++------- .../contentpicker/contentpicker.controller.js | 6 ++-- .../grid/editors/media.controller.js | 2 +- .../propertyeditors/grid/editors/rte.html | 2 +- .../mediapicker/mediapicker.controller.js | 2 +- .../multiurlpicker.controller.js | 2 +- src/Umbraco.Web/Editors/EntityController.cs | 24 +++++++------- .../ContentEditing/ContentPropertyBasic.cs | 3 +- .../Trees/ContentTreeControllerBase.cs | 8 ++--- .../Trees/TreeQueryStringParameters.cs | 2 +- 19 files changed, 81 insertions(+), 82 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js index 8e561ff5ca..cd1f011018 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js @@ -5,7 +5,7 @@ angular.module("umbraco.directives") uniqueId: '=', value: '=', configuration: "=", //this is the RTE configuration - datatypeId: '@', + datatypeKey: '@', ignoreUserStartNodes: '@' }, templateUrl: 'views/components/grid/grid-rte.html', @@ -43,7 +43,7 @@ angular.module("umbraco.directives") scope.config = { ignoreUserStartNodes: scope.ignoreUserStartNodes === "true" } - scope.dataTypeId = scope.datatypeId; //Yes - this casing is rediculous, but it's because the var starts with `data` so it can't be `data-type-id` :/ + scope.dataTypeKey = scope.datatypeKey; //Yes - this casing is rediculous, but it's because the var starts with `data` so it can't be `data-type-id` :/ //stores a reference to the editor var tinyMceEditor = null; diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js index 3b6fb5f9cd..9c28cbe367 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreesearchbox.directive.js @@ -12,7 +12,7 @@ function treeSearchBox(localizationService, searchService, $q) { searchFromName: "@", showSearch: "@", section: "@", - datatypeId: "@", + datatypeKey: "@", hideSearchCallback: "=", searchCallback: "=" }, @@ -63,8 +63,8 @@ function treeSearchBox(localizationService, searchService, $q) { } //append dataTypeId value if there is one - if (scope.datatypeId) { - searchArgs["dataTypeId"] = scope.datatypeId; + if (scope.datatypeKey) { + searchArgs["dataTypeKey"] = scope.datatypeKey; } searcher(searchArgs).then(function (data) { diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js index 01bb2369dc..69522f3fa4 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js @@ -327,8 +327,8 @@ function entityResource($q, $http, umbRequestHelper) { { type: type }, { culture: culture} ]; - if (options && options.dataTypeId) { - args.push({ dataTypeId: options.dataTypeId }); + if (options && options.dataTypeKey) { + args.push({ dataTypeKey: options.dataTypeKey }); } return umbRequestHelper.resourcePromise( @@ -356,8 +356,8 @@ function entityResource($q, $http, umbRequestHelper) { getChildren: function (id, type, options) { var args = [{ id: id }, { type: type }]; - if (options && options.dataTypeId) { - args.push({ dataTypeId: options.dataTypeId }); + if (options && options.dataTypeKey) { + args.push({ dataTypeKey: options.dataTypeKey }); } return umbRequestHelper.resourcePromise( @@ -434,7 +434,7 @@ function entityResource($q, $http, umbRequestHelper) { orderBy: options.orderBy, orderDirection: options.orderDirection, filter: encodeURIComponent(options.filter), - dataTypeId: options.dataTypeId + dataTypeKey: options.dataTypeKey } )), 'Failed to retrieve child data for id ' + parentId); @@ -476,7 +476,7 @@ function entityResource($q, $http, umbRequestHelper) { filter: '', orderDirection: "Ascending", orderBy: "SortOrder", - dataTypeId: null + dataTypeKey: null }; if (options === undefined) { options = {}; @@ -506,7 +506,7 @@ function entityResource($q, $http, umbRequestHelper) { orderBy: options.orderBy, orderDirection: options.orderDirection, filter: encodeURIComponent(options.filter), - dataTypeId: options.dataTypeId + dataTypeKey: options.dataTypeKey } )), 'Failed to retrieve child data for id ' + parentId); @@ -535,15 +535,15 @@ function entityResource($q, $http, umbRequestHelper) { * @returns {Promise} resourcePromise object containing the entity array. * */ - search: function (query, type, searchFrom, canceler, dataTypeId) { + search: function (query, type, searchFrom, canceler, dataTypeKey) { var args = [{ query: query }, { type: type }]; if (searchFrom) { args.push({ searchFrom: searchFrom }); } - if (dataTypeId) { - args.push({ dataTypeId: dataTypeId }); + if (dataTypeKey) { + args.push({ dataTypeKey: dataTypeKey }); } var httpConfig = {}; diff --git a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js index cdba3647a3..fef286ec7e 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/search.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/search.service.js @@ -67,7 +67,7 @@ angular.module('umbraco.services') throw "args.term is required"; } - return entityResource.search(args.term, "Document", args.searchFrom, args.canceler, args.dataTypeId).then(function (data) { + return entityResource.search(args.term, "Document", args.searchFrom, args.canceler, args.dataTypeKey).then(function (data) { _.each(data, function (item) { searchResultFormatter.configureContentResult(item); }); @@ -92,7 +92,7 @@ angular.module('umbraco.services') throw "args.term is required"; } - return entityResource.search(args.term, "Media", args.searchFrom, args.canceler, args.dataTypeId).then(function (data) { + return entityResource.search(args.term, "Media", args.searchFrom, args.canceler, args.dataTypeKey).then(function (data) { _.each(data, function (item) { searchResultFormatter.configureMediaResult(item); }); diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js index d3bdceddc4..e61bd38bc0 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js @@ -1121,7 +1121,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s entityResource.getAnchors(args.model.value).then(function (anchorValues) { var linkPicker = { currentTarget: currentTarget, - dataTypeId: args.model.dataTypeId, + dataTypeKey: args.model.dataTypeKey, ignoreUserStartNodes: args.model.config.ignoreUserStartNodes, anchors: anchorValues, submit: function (model) { @@ -1159,7 +1159,7 @@ function tinyMceService($rootScope, $q, imageHelper, $locale, $http, $timeout, s disableFolderSelect: true, startNodeId: startNodeId, startNodeIsVirtual: startNodeIsVirtual, - dataTypeId: args.model.dataTypeId, + dataTypeKey: args.model.dataTypeKey, submit: function (model) { self.insertMediaInEditor(args.editor, model.selection[0]); editorService.close(); diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js index 5fd23f0dd6..5a0ab51fd0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js @@ -20,14 +20,14 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController", $scope.model.title = value; }); } - $scope.customTreeParams = dialogOptions.dataTypeId ? "dataTypeId=" + dialogOptions.dataTypeId : ""; + $scope.customTreeParams = dialogOptions.dataTypeKey ? "dataTypeKey=" + dialogOptions.dataTypeKey : ""; $scope.dialogTreeApi = {}; $scope.model.target = {}; $scope.searchInfo = { searchFromId: null, searchFromName: null, showSearch: false, - dataTypeId: dialogOptions.dataTypeId, + dataTypeKey: dialogOptions.dataTypeKey, results: [], selectedSearchResults: [] }; @@ -175,7 +175,7 @@ angular.module("umbraco").controller("Umbraco.Editors.LinkPickerController", var mediaPicker = { startNodeId: startNodeId, startNodeIsVirtual: startNodeIsVirtual, - dataTypeId: dialogOptions.dataTypeId, + dataTypeKey: dialogOptions.dataTypeKey, submit: function (model) { var media = model.selection[0]; diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html index e1880d5ac5..704b61e333 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.html @@ -25,7 +25,7 @@ ng-model="model.target.url" ng-disabled="model.target.id || model.target.udi" /> - + - + - + - +
Link to page
- +
- - +
- - - +
-
- - - + - +
Link to media
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js index 481f15f647..bcda921269 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js @@ -57,7 +57,7 @@ angular.module("umbraco") totalItems: 0, totalPages: 0, filter: '', - dataTypeId: $scope.model.dataTypeId + dataTypeKey: $scope.model.dataTypeKey }; //preload selected item @@ -160,7 +160,7 @@ angular.module("umbraco") } if (folder.id > 0) { - entityResource.getAncestors(folder.id, "media", null, { dataTypeId: $scope.model.dataTypeId }) + entityResource.getAncestors(folder.id, "media", null, { dataTypeKey: $scope.model.dataTypeKey }) .then(function (anc) { $scope.path = _.filter(anc, function (f) { @@ -318,7 +318,7 @@ angular.module("umbraco") totalItems: 0, totalPages: 0, filter: '', - dataTypeId: $scope.model.dataTypeId + dataTypeKey: $scope.model.dataTypeKey }; getChildren($scope.currentFolder.id); } diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js index 88caac716a..31430c81cb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.controller.js @@ -28,12 +28,12 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController", vm.treeAlias = $scope.model.treeAlias; vm.multiPicker = $scope.model.multiPicker; vm.hideHeader = (typeof $scope.model.hideHeader) === "boolean" ? $scope.model.hideHeader : true; - vm.dataTypeId = $scope.model.dataTypeId; + vm.dataTypeKey = $scope.model.dataTypeKey; vm.searchInfo = { searchFromId: $scope.model.startNodeId, searchFromName: null, showSearch: false, - dataTypeId: vm.dataTypeId, + dataTypeKey: vm.dataTypeKey, results: [], selectedSearchResults: [] } @@ -192,8 +192,8 @@ angular.module("umbraco").controller("Umbraco.Editors.TreePickerController", if (vm.selectedLanguage && vm.selectedLanguage.id) { queryParams["culture"] = vm.selectedLanguage.culture; } - if (vm.dataTypeId) { - queryParams["dataTypeId"] = vm.dataTypeId; + if (vm.dataTypeKey) { + queryParams["dataTypeKey"] = vm.dataTypeKey; } var queryString = $.param(queryParams); //create the query string from the params object diff --git a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html index 01c14a284f..78c75f6f8d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html @@ -27,7 +27,7 @@ {{language.name}}
- +
- + - + {{ vm.emptyStateMessage }} - +
-
- + - - - + - + diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js index 7fafa20b0f..6667c3b539 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js @@ -86,7 +86,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper showOpenButton: false, showEditButton: false, showPathOnHover: false, - dataTypeId: null, + dataTypeKey: null, maxNumber: 1, minNumber: 0, startNode: { @@ -140,7 +140,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper entityType: entityType, filterCssClass: "not-allowed not-published", startNodeId: null, - dataTypeId: $scope.model.dataTypeId, + dataTypeKey: $scope.model.dataTypeKey, currentNode: editorState ? editorState.current : null, callback: function (data) { if (angular.isArray(data)) { @@ -162,7 +162,7 @@ function contentPickerController($scope, entityResource, editorState, iconHelper // pre-value config on to the dialog options angular.extend(dialogOptions, $scope.model.config); - dialogOptions.dataTypeId = $scope.model.dataTypeId; + dialogOptions.dataTypeKey = $scope.model.dataTypeKey; // if we can't pick more than one item, explicitly disable multiPicker in the dialog options if ($scope.model.config.maxNumber && parseInt($scope.model.config.maxNumber) === 1) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js index 4e6c87d7a8..574aa87557 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js @@ -30,7 +30,7 @@ angular.module("umbraco") showDetails: true, disableFolderSelect: true, onlyImages: true, - dataTypeId: $scope.model.dataTypeId, + dataTypeKey: $scope.model.dataTypeKey, submit: function(model) { var selectedImage = model.selection[0]; diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html index 63bc7570e1..7bfc6d125e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.html @@ -4,7 +4,7 @@ configuration="model.config.rte" value="control.value" unique-id="control.$uniqueId" - datatype-id="{{model.dataTypeId}}" + datatype-key="{{model.dataTypeKey}}" ignore-user-start-nodes="{{model.config.ignoreUserStartNodes}}"> diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js index 41c1fa8c16..f7e88bef36 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js @@ -187,7 +187,7 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl var mediaPicker = { startNodeId: $scope.model.config.startNodeId, startNodeIsVirtual: $scope.model.config.startNodeIsVirtual, - dataTypeId: $scope.model.dataTypeId, + dataTypeKey: $scope.model.dataTypeKey, multiPicker: multiPicker, onlyImages: onlyImages, disableFolderSelect: disableFolderSelect, diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js index abaee3fca0..69bcc6b41a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js @@ -77,7 +77,7 @@ function multiUrlPickerController($scope, angularHelper, localizationService, en var linkPicker = { currentTarget: target, - dataTypeId: $scope.model.dataTypeId, + dataTypeKey: $scope.model.dataTypeKey, ignoreUserStartNodes : $scope.model.config.ignoreUserStartNodes, submit: function (model) { if (model.target.url || model.target.anchor) { diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs index 6ee16ae1ee..b3edb308a2 100644 --- a/src/Umbraco.Web/Editors/EntityController.cs +++ b/src/Umbraco.Web/Editors/EntityController.cs @@ -104,10 +104,10 @@ namespace Umbraco.Web.Editors /// /// A starting point for the search, generally a node id, but for members this is a member type alias /// - /// If set used to look up whether user and group start node permissions will be ignored. + /// If set used to look up whether user and group start node permissions will be ignored. /// [HttpGet] - public IEnumerable Search(string query, UmbracoEntityTypes type, string searchFrom = null, Guid? dataTypeId = null) + public IEnumerable Search(string query, UmbracoEntityTypes type, string searchFrom = null, Guid? dataTypeKey = null) { // NOTE: Theoretically you shouldn't be able to see member data if you don't have access to members right? ... but there is a member picker, so can't really do that @@ -116,7 +116,7 @@ namespace Umbraco.Web.Editors //TODO: This uses the internal UmbracoTreeSearcher, this instead should delgate to the ISearchableTree implementation for the type - var ignoreUserStartNodes = dataTypeId.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value); + var ignoreUserStartNodes = dataTypeKey.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeKey.Value); return ExamineSearch(query, type, searchFrom, ignoreUserStartNodes); } @@ -424,7 +424,7 @@ namespace Umbraco.Web.Editors } #endregion - public IEnumerable GetChildren(int id, UmbracoEntityTypes type, Guid? dataTypeId = null) + public IEnumerable GetChildren(int id, UmbracoEntityTypes type, Guid? dataTypeKey = null) { var objectType = ConvertToObjectType(type); if (objectType.HasValue) @@ -433,7 +433,7 @@ namespace Umbraco.Web.Editors var startNodes = GetStartNodes(type); - var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId); + var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey); // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes if (id == Constants.System.Root && startNodes.Length > 0 && startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes) @@ -482,7 +482,7 @@ namespace Umbraco.Web.Editors string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "", - Guid? dataTypeId = null) + Guid? dataTypeKey = null) { if (int.TryParse(id, out var intId)) { @@ -507,7 +507,7 @@ namespace Umbraco.Web.Editors //the EntityService can search paged members from the root intId = -1; - return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter, dataTypeId); + return GetPagedChildren(intId, type, pageNumber, pageSize, orderBy, orderDirection, filter, dataTypeKey); } //the EntityService cannot search members of a certain type, this is currently not supported and would require @@ -543,7 +543,7 @@ namespace Umbraco.Web.Editors string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "", - Guid? dataTypeId = null) + Guid? dataTypeKey = null) { if (pageNumber <= 0) throw new HttpResponseException(HttpStatusCode.NotFound); @@ -558,7 +558,7 @@ namespace Umbraco.Web.Editors var startNodes = GetStartNodes(type); - var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId); + var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey); // root is special: we reduce it to start nodes if the user's start node is not the default, then we need to return their start nodes if (id == Constants.System.Root && startNodes.Length > 0 && startNodes.Contains(Constants.System.Root) == false && !ignoreUserStartNodes) @@ -642,7 +642,7 @@ namespace Umbraco.Web.Editors string orderBy = "SortOrder", Direction orderDirection = Direction.Ascending, string filter = "", - Guid? dataTypeId = null) + Guid? dataTypeKey = null) { if (pageNumber <= 0) throw new HttpResponseException(HttpStatusCode.NotFound); @@ -661,7 +661,7 @@ namespace Umbraco.Web.Editors int[] aids = GetStartNodes(type); - var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeId); + var ignoreUserStartNodes = IsDataTypeIgnoringUserStartNodes(dataTypeKey); entities = aids == null || aids.Contains(Constants.System.Root) || ignoreUserStartNodes ? Services.EntityService.GetPagedDescendants(objectType.Value, pageNumber - 1, pageSize, out totalRecords, SqlContext.Query().Where(x => x.Name.Contains(filter)), @@ -704,7 +704,7 @@ namespace Umbraco.Web.Editors } } - private bool IsDataTypeIgnoringUserStartNodes(Guid? dataTypeId) => dataTypeId.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value); + private bool IsDataTypeIgnoringUserStartNodes(Guid? dataTypeKey) => dataTypeKey.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeKey.Value); public IEnumerable GetAncestors(int id, UmbracoEntityTypes type, [ModelBinder(typeof(HttpQueryStringModelBinder))]FormDataCollection queryStrings) { diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs index f0f5bba7c4..c5c22484ad 100644 --- a/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs +++ b/src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs @@ -22,8 +22,7 @@ namespace Umbraco.Web.Models.ContentEditing [Required] public int Id { get; set; } - //fixme: This name dataTypeId is inconsistent, but requires us to change it everywhere in angular - [DataMember(Name = "dataTypeId", IsRequired = false)] + [DataMember(Name = "dataTypeKey", IsRequired = false)] [ReadOnly(true)] public Guid DataTypeKey { get; set; } diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs index 4fa9db13e3..015c91cb81 100644 --- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs +++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs @@ -338,7 +338,7 @@ namespace Umbraco.Web.Trees //Here we need to figure out if the node is a container and if so check if the user has a custom start node, then check if that start node is a child // of this container node. If that is true, the HasChildren must be true so that the tree node still renders even though this current node is a container/list view. if (isContainer && UserStartNodes.Length > 0 && UserStartNodes.Contains(Constants.System.Root) == false) - { + { var startNodes = Services.EntityService.GetAll(UmbracoObjectType, UserStartNodes); //if any of these start nodes' parent is current, then we need to render children normally so we need to switch some logic and tell // the UI that this node does have children and that it isn't a container @@ -396,7 +396,7 @@ namespace Umbraco.Web.Trees } var menu = new MenuItemCollection(); - // only add empty recycle bin if the current user is allowed to delete by default + // only add empty recycle bin if the current user is allowed to delete by default if (deleteAllowed) { menu.Items.Add(new MenuItem("emptyRecycleBin", Services.TextService) @@ -538,8 +538,8 @@ namespace Umbraco.Web.Trees { if (_ignoreUserStartNodes.HasValue) return _ignoreUserStartNodes.Value; - var dataTypeId = queryStrings.GetValue(TreeQueryStringParameters.DataTypeId); - _ignoreUserStartNodes = dataTypeId.HasValue ? Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeId.Value) : false; + var dataTypeKey = queryStrings.GetValue(TreeQueryStringParameters.DataTypeKey); + _ignoreUserStartNodes = dataTypeKey.HasValue && Services.DataTypeService.IsDataTypeIgnoringUserStartNodes(dataTypeKey.Value); return _ignoreUserStartNodes.Value; } diff --git a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs index 9d012cb25c..02a198401b 100644 --- a/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs +++ b/src/Umbraco.Web/Trees/TreeQueryStringParameters.cs @@ -8,7 +8,7 @@ public const string Use = "use"; public const string Application = "application"; public const string StartNodeId = "startNodeId"; - public const string DataTypeId = "dataTypeId"; + public const string DataTypeKey = "dataTypeKey"; //public const string OnNodeClick = "OnNodeClick"; //public const string RenderParent = "RenderParent"; }