yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1832 from leekelleher/issue/U4-8098

Browse Source 
Fixes U4-8900 - XPath: "$current" on Multinodetreepicker gives error in Document Type editor
This commit is contained in:
Mikkel Holck Madsen
2017-06-15 15:02:14 +02:00
committed by GitHub
parent c1aefe0686 6772b1de35
commit b3ea0c83f9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
View File

@@ -144,8 +144,11 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
}
//if we have a query for the startnode, we will use that.
if ($scope.model.config.startNode.query) {
if ($routeParams.section === "settings" && $routeParams.tree === "documentTypes") {
//if the content-picker is being rendered inside the document-type editor, we don't need to process the startnode query
dialogOptions.startNodeId = -1;
} else if ($scope.model.config.startNode.query) {
//if we have a query for the startnode, we will use that.
var rootId = $routeParams.id;
entityResource.getByQuery($scope.model.config.startNode.query, rootId, "Document").then(function (ent) {
dialogOptions.startNodeId = $scope.model.config.idType === "udi" ? ent.udi : ent.id;