Merge remote-tracking branch 'origin/master'

This commit is contained in:
zadam 2022-03-22 21:04:52 +01:00
commit 228564f843

View File

@ -59,7 +59,7 @@ class Note extends AbstractEntity {
} }
getVisibleChildNotes() { getVisibleChildNotes() {
return this.children.filter(childNote => !childNote.hasLabel('shareHiddenFromTree')); return this.children.filter(childNote => !childNote.hasLabel('shareHiddenFromTree') && !childNote.isProtected);
} }
hasChildren() { hasChildren() {
@ -67,7 +67,7 @@ class Note extends AbstractEntity {
} }
hasVisibleChildren() { hasVisibleChildren() {
return this.children && !!this.children.find(childNote => !childNote.hasLabel('shareHiddenFromTree')); return this.children && !!this.children.find(childNote => !childNote.hasLabel('shareHiddenFromTree') && !childNote.isProtected);
} }
getChildBranches() { getChildBranches() {