Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-08-31 03:06:33 +02:00
Code Issues Packages Projects Releases Activity

template attributes don't need isInheritable flag to take effect

Browse Source
This commit is contained in:
zadam
2019-09-07 11:00:15 +02:00
parent b069436039
commit faae11f070
4 changed files with 139 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/entities/note.js
View File

@@ -295,16 +295,16 @@ class Note extends Entity {
treeWithAttrs(noteId, level) AS (
SELECT * FROM tree
UNION
SELECT attributes.value, treeWithAttrs.level + 1 FROM attributes
SELECT attributes.value, treeWithAttrs.level FROM attributes
JOIN treeWithAttrs ON treeWithAttrs.noteId = attributes.noteId
WHERE attributes.isDeleted = 0
AND attributes.type = 'relation'
AND attributes.name = 'template'
AND (attributes.noteId = ? OR attributes.isInheritable = 1)
AND (treeWithAttrs.level = 0 OR attributes.isInheritable = 1)
)
SELECT attributes.* FROM attributes JOIN treeWithAttrs ON attributes.noteId = treeWithAttrs.noteId
WHERE attributes.isDeleted = 0 AND (attributes.isInheritable = 1 OR attributes.noteId = ?)
ORDER BY level, noteId, position`, [this.noteId, this.noteId, this.noteId]);
WHERE attributes.isDeleted = 0 AND (attributes.isInheritable = 1 OR treeWithAttrs.level = 0)
ORDER BY level, noteId, position`, [this.noteId]);
// attributes are ordered so that "closest" attributes are first
// we order by noteId so that attributes from same note stay together. Actual noteId ordering doesn't matter.

3
src/public/javascripts/widgets/edited_notes.js
View File

@@ -9,7 +9,8 @@ class EditedNotesWidget extends StandardWidget {
getMaxHeight() { return "200px"; }
async isEnabled() {
return await this.ctx.note.hasLabel("dateNote");
return await super.isEnabled()
&& await this.ctx.note.hasLabel("dateNote");
}
async doRenderBody() {