From 171877ce08340bd09b021770bfea8a730756c9db Mon Sep 17 00:00:00 2001 From: azivner Date: Tue, 21 Aug 2018 12:52:11 +0200 Subject: [PATCH] renamed inheritAttributes to template --- src/entities/note.js | 2 +- src/services/attributes.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/entities/note.js b/src/entities/note.js index ee793247f..2c1f89e84 100644 --- a/src/entities/note.js +++ b/src/entities/note.js @@ -112,7 +112,7 @@ class Note extends Entity { JOIN treeWithAttrs ON treeWithAttrs.noteId = attributes.noteId WHERE attributes.isDeleted = 0 AND attributes.type = 'relation' - AND attributes.name = 'inheritAttributes' + AND attributes.name = 'template' AND (attributes.noteId = ? OR attributes.isInheritable = 1) ) SELECT attributes.* FROM attributes JOIN treeWithAttrs ON attributes.noteId = treeWithAttrs.noteId diff --git a/src/services/attributes.js b/src/services/attributes.js index 2933750da..41c15ed68 100644 --- a/src/services/attributes.js +++ b/src/services/attributes.js @@ -25,7 +25,7 @@ const BUILTIN_ATTRIBUTES = [ { type: 'relation', name: 'runOnChildNoteCreation' }, { type: 'relation', name: 'runOnAttributeCreation' }, { type: 'relation', name: 'runOnAttributeChange' }, - { type: 'relation', name: 'inheritAttributes' } + { type: 'relation', name: 'template' } ]; async function getNotesWithLabel(name, value) {