From 0415efd33b56f23ad46a9a393676355651380a6e Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 27 Nov 2019 19:42:10 +0100 Subject: [PATCH] create year/month/date labels/relation only when the note is created --- src/services/date_notes.js | 34 +++++++++++++++++----------------- src/services/notes.js | 2 ++ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/services/date_notes.js b/src/services/date_notes.js index 7c37aeda7..fffb62e4a 100644 --- a/src/services/date_notes.js +++ b/src/services/date_notes.js @@ -65,15 +65,15 @@ async function getYearNote(dateStr, rootNote) { if (!yearNote) { yearNote = await createNote(rootNote.noteId, yearStr); - } - await attributeService.createLabel(yearNote.noteId, YEAR_LABEL, yearStr); - await attributeService.createLabel(yearNote.noteId, 'sorted'); + await attributeService.createLabel(yearNote.noteId, YEAR_LABEL, yearStr); + await attributeService.createLabel(yearNote.noteId, 'sorted'); - const yearTemplateAttr = await rootNote.getOwnedAttribute('relation', 'yearTemplate'); + const yearTemplateAttr = await rootNote.getOwnedAttribute('relation', 'yearTemplate'); - if (yearTemplateAttr) { - await attributeService.createRelation(yearNote.noteId, 'template', yearTemplateAttr.value); + if (yearTemplateAttr) { + await attributeService.createRelation(yearNote.noteId, 'template', yearTemplateAttr.value); + } } } @@ -111,15 +111,15 @@ async function getMonthNote(dateStr, rootNote) { const noteTitle = await getMonthNoteTitle(rootNote, monthNumber, dateObj); monthNote = await createNote(yearNote.noteId, noteTitle); - } - await attributeService.createLabel(monthNote.noteId, MONTH_LABEL, monthStr); - await attributeService.createLabel(monthNote.noteId, 'sorted'); + await attributeService.createLabel(monthNote.noteId, MONTH_LABEL, monthStr); + await attributeService.createLabel(monthNote.noteId, 'sorted'); - const monthTemplateAttr = await rootNote.getOwnedAttribute('relation', 'monthTemplate'); + const monthTemplateAttr = await rootNote.getOwnedAttribute('relation', 'monthTemplate'); - if (monthTemplateAttr) { - await attributeService.createRelation(monthNote.noteId, 'template', monthTemplateAttr.value); + if (monthTemplateAttr) { + await attributeService.createRelation(monthNote.noteId, 'template', monthTemplateAttr.value); + } } } @@ -156,14 +156,14 @@ async function getDateNote(dateStr) { const noteTitle = await getDateNoteTitle(rootNote, dayNumber, dateObj); dateNote = await createNote(monthNote.noteId, noteTitle); - } - await attributeService.createLabel(dateNote.noteId, DATE_LABEL, dateStr.substr(0, 10)); + await attributeService.createLabel(dateNote.noteId, DATE_LABEL, dateStr.substr(0, 10)); - const dateTemplateAttr = await rootNote.getOwnedAttribute('relation', 'dateTemplate'); + const dateTemplateAttr = await rootNote.getOwnedAttribute('relation', 'dateTemplate'); - if (dateTemplateAttr) { - await attributeService.createRelation(dateNote.noteId, 'template', dateTemplateAttr.value); + if (dateTemplateAttr) { + await attributeService.createRelation(dateNote.noteId, 'template', dateTemplateAttr.value); + } } } diff --git a/src/services/notes.js b/src/services/notes.js index d4ae65e26..eba8f5da1 100644 --- a/src/services/notes.js +++ b/src/services/notes.js @@ -49,6 +49,8 @@ function deriveMime(type, mime) { mime = 'text/plain'; } else if (['relation-map', 'search'].includes(type)) { mime = 'application/json'; + } else if (type === 'render') { + mime = ''; } return mime;