From f7e5d8f62d625d7f9ca838b4789938f9e68848d9 Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 16 Feb 2022 22:16:15 +0100 Subject: [PATCH] fix displaying hidden notes in the note's children list #2664 --- src/share/shaca/entities/note.js | 10 ++++++++++ src/views/share/page.ejs | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/share/shaca/entities/note.js b/src/share/shaca/entities/note.js index f66ce27fb..ac7377f88 100644 --- a/src/share/shaca/entities/note.js +++ b/src/share/shaca/entities/note.js @@ -58,10 +58,20 @@ class Note extends AbstractEntity { return this.children; } + getVisibleChildNotes() { + console.log(this.children.filter(childNote => !childNote.hasLabel('shareHiddenFromTree'))); + + return this.children.filter(childNote => !childNote.hasLabel('shareHiddenFromTree')); + } + hasChildren() { return this.children && this.children.length > 0; } + hasVisibleChildren() { + return this.children && !!this.children.find(childNote => !childNote.hasLabel('shareHiddenFromTree')); + } + getChildBranches() { return this.children.map(childNote => this.shaca.getBranchFromChildAndParent(childNote.noteId, this.noteId)); } diff --git a/src/views/share/page.ejs b/src/views/share/page.ejs index b7506b853..ed52d218b 100644 --- a/src/views/share/page.ejs +++ b/src/views/share/page.ejs @@ -46,7 +46,7 @@ <% } %> - <% if (note.hasChildren()) { %> + <% if (note.hasVisibleChildren()) { %>