mirror of
				https://github.com/zadam/trilium.git
				synced 2025-10-31 18:36:30 +01:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master'
This commit is contained in:
		| @@ -59,7 +59,7 @@ class Note extends AbstractEntity { | ||||
|     } | ||||
|  | ||||
|     getVisibleChildNotes() { | ||||
|         return this.children.filter(childNote => !childNote.hasLabel('shareHiddenFromTree')); | ||||
|         return this.children.filter(childNote => !childNote.hasLabel('shareHiddenFromTree') && !childNote.isProtected); | ||||
|     } | ||||
|  | ||||
|     hasChildren() { | ||||
| @@ -67,7 +67,7 @@ class Note extends AbstractEntity { | ||||
|     } | ||||
|  | ||||
|     hasVisibleChildren() { | ||||
|         return this.children && !!this.children.find(childNote => !childNote.hasLabel('shareHiddenFromTree')); | ||||
|         return this.children && !!this.children.find(childNote => !childNote.hasLabel('shareHiddenFromTree') && !childNote.isProtected); | ||||
|     } | ||||
|  | ||||
|     getChildBranches() { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user