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

Merge pull request #2498 from hemraker/temp-U4-10899

Browse Source 
Fixes U4-10899: Template circular dependency
This commit is contained in:
Claus
2018-06-12 13:04:23 +02:00
committed by GitHub
parent 0eceb3c7fc 20216df8cf
commit 2715d49630
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
View File

@@ -516,9 +516,13 @@
var availableMasterTemplates = [];
// filter out the current template and the selected master template
angular.forEach(vm.templates, function(template){
if(template.alias !== vm.template.alias && template.alias !== vm.template.masterTemplateAlias) {
availableMasterTemplates.push(template);
angular.forEach(vm.templates, function (template) {
if (template.alias !== vm.template.alias && template.alias !== vm.template.masterTemplateAlias) {
var templatePathArray = template.path.split(',');
// filter descendant templates of current template
if (templatePathArray.indexOf(String(vm.template.id)) === -1) {
availableMasterTemplates.push(template);
}
}
});