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

Merge pull request #7344 from kjac/v8/fix/mntp-start-node-and-filter

Browse Source 
V8: Display MNTP "Allow items of type" correctly when a start node is set
This commit is contained in:
Poornima Nayar
2019-12-27 13:58:50 +00:00
committed by GitHub
parent 61adf4cd48 448f3406dd
commit b4cfb1f75d
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesource.controller.js
View File

@@ -19,15 +19,16 @@ angular.module('umbraco')
}; };
} }
if($scope.model.value.id && $scope.model.value.type !== "member"){ if($scope.model.value.id && $scope.model.value.type !== "member"){
entityResource.getById($scope.model.value.id, entityType()).then(function(item){ entityResource.getById($scope.model.value.id, entityType()).then(function(item){
populate(item); populate(item);
}); });
}
else {
$timeout(function () {
treeSourceChanged();
}, 100);
} }
$timeout(function () {
treeSourceChanged();
}, 100);
function entityType() { function entityType() {
var ent = "Document"; var ent = "Document";

6
src/Umbraco.Web.UI.Client/src/views/prevalueeditors/treesourcetypepicker.controller.js
View File

@@ -7,7 +7,6 @@ function TreeSourceTypePickerController($scope, contentTypeResource, mediaTypeRe
var allItemTypes = null; var allItemTypes = null;
var currentItemType = null; var currentItemType = null;
var initialLoad = true;
function init() { function init() {
vm.loading = true; vm.loading = true;
@@ -86,13 +85,12 @@ function TreeSourceTypePickerController($scope, contentTypeResource, mediaTypeRe
} }
eventsService.on("treeSourceChanged", function (e, args) { eventsService.on("treeSourceChanged", function (e, args) {
currentItemType = args.value;
// reset the model value if we changed node type (but not on the initial load) // reset the model value if we changed node type (but not on the initial load)
if (!initialLoad) { if (!!currentItemType && currentItemType !== args.value) {
vm.itemTypes = []; vm.itemTypes = [];
updateModel(); updateModel();
} }
initialLoad = false; currentItemType = args.value;
init(); init();
}); });
} }