Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-10-31 13:01:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

template can now contain also content

Browse Source
This commit is contained in:
zadam 2019-09-08 16:57:41 +02:00
parent 16be0c1014
commit 30c56cd8af
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/public/javascripts/widgets/calendar.js
View File

@ -49,9 +49,9 @@ class CalendarWidget extends StandardWidget {
} }
init($el, activeDate) { init($el, activeDate) {
this.date = new Date();
this.todaysDate = new Date();
this.activeDate = new Date(Date.parse(activeDate)); this.activeDate = new Date(Date.parse(activeDate));
this.todaysDate = new Date();
this.date = new Date(this.activeDate.getTime());
this.$month = $el.find('[data-calendar-area="month"]'); this.$month = $el.find('[data-calendar-area="month"]');
this.$next = $el.find('[data-calendar-toggle="next"]'); this.$next = $el.find('[data-calendar-toggle="next"]');

23
src/services/handlers.js
View File

@ -2,6 +2,7 @@ const eventService = require('./events');
const scriptService = require('./script'); const scriptService = require('./script');
const treeService = require('./tree'); const treeService = require('./tree');
const log = require('./log'); const log = require('./log');
const repository = require('./repository');
const Attribute = require('../entities/attribute'); const Attribute = require('../entities/attribute');
async function runAttachedRelations(note, relationName, originEntity) { async function runAttachedRelations(note, relationName, originEntity) {
@ -45,6 +46,28 @@ eventService.subscribe([ eventService.ENTITY_CHANGED, eventService.ENTITY_DELETE
eventService.subscribe(eventService.ENTITY_CREATED, async ({ entityName, entity }) => { eventService.subscribe(eventService.ENTITY_CREATED, async ({ entityName, entity }) => {
if (entityName === 'attributes') { if (entityName === 'attributes') {
await runAttachedRelations(await entity.getNote(), 'runOnAttributeCreation', entity); await runAttachedRelations(await entity.getNote(), 'runOnAttributeCreation', entity);
if (entity.type === 'relation' && entity.name === 'template') {
const note = await repository.getNote(entity.noteId);
if (!note.isStringNote()) {
return;
}
const content = await note.getContent();
if (content && content.trim().length > 0) {
return;
}
const targetNote = await repository.getNote(entity.value);
if (!targetNote || !targetNote.isStringNote()) {
return;
}
await note.setContent(await targetNote.getContent());
}
} }
else if (entityName === 'notes') { else if (entityName === 'notes') {
await runAttachedRelations(entity, 'runOnNoteCreation', entity); await runAttachedRelations(entity, 'runOnNoteCreation', entity);