mirror of
https://github.com/TriliumNext/Notes.git
synced 2025-11-09 02:41:39 +08:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
228564f843
@ -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() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user