gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix creation of top level note, closes #501

Browse Source
This commit is contained in:
zadam 2019-04-29 21:18:12 +02:00
parent 29931bbddf
commit 8205cdc288
3 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.idea/dataSources/a2c75661-f9e2-478f-a69f-6a9409e69997.xml generated
View File

@ -59,7 +59,6 @@
<index id="25" parent="6" name="sqlite_autoindex_api_tokens_1"> <index id="25" parent="6" name="sqlite_autoindex_api_tokens_1">
<NameSurrogate>1</NameSurrogate> <NameSurrogate>1</NameSurrogate>
<ColNames>apiTokenId</ColNames> <ColNames>apiTokenId</ColNames>
<ColumnCollations></ColumnCollations>
<Unique>1</Unique> <Unique>1</Unique>
</index> </index>
<key id="26" parent="6"> <key id="26" parent="6">
@ -128,25 +127,20 @@
<index id="38" parent="7" name="sqlite_autoindex_attributes_1"> <index id="38" parent="7" name="sqlite_autoindex_attributes_1">
<NameSurrogate>1</NameSurrogate> <NameSurrogate>1</NameSurrogate>
<ColNames>attributeId</ColNames> <ColNames>attributeId</ColNames>
<ColumnCollations></ColumnCollations>
<Unique>1</Unique> <Unique>1</Unique>
</index> </index>
<index id="39" parent="7" name="IDX_attributes_noteId_index"> <index id="39" parent="7" name="IDX_attributes_noteId_index">
<ColNames>noteId</ColNames> <ColNames>noteId</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<index id="40" parent="7" name="IDX_attributes_name_value"> <index id="40" parent="7" name="IDX_attributes_name_value">
<ColNames>name <ColNames>name
value</ColNames> value</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<index id="41" parent="7" name="IDX_attributes_name_index"> <index id="41" parent="7" name="IDX_attributes_name_index">
<ColNames>name</ColNames> <ColNames>name</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<index id="42" parent="7" name="IDX_attributes_value_index"> <index id="42" parent="7" name="IDX_attributes_value_index">
<ColNames>value</ColNames> <ColNames>value</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<key id="43" parent="7"> <key id="43" parent="7">
<ColNames>attributeId</ColNames> <ColNames>attributeId</ColNames>
@ -206,21 +200,17 @@ value</ColNames>
<index id="54" parent="8" name="sqlite_autoindex_branches_1"> <index id="54" parent="8" name="sqlite_autoindex_branches_1">
<NameSurrogate>1</NameSurrogate> <NameSurrogate>1</NameSurrogate>
<ColNames>branchId</ColNames> <ColNames>branchId</ColNames>
<ColumnCollations></ColumnCollations>
<Unique>1</Unique> <Unique>1</Unique>
</index> </index>
<index id="55" parent="8" name="IDX_branches_noteId_parentNoteId"> <index id="55" parent="8" name="IDX_branches_noteId_parentNoteId">
<ColNames>noteId <ColNames>noteId
parentNoteId</ColNames> parentNoteId</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<index id="56" parent="8" name="IDX_branches_noteId"> <index id="56" parent="8" name="IDX_branches_noteId">
<ColNames>noteId</ColNames> <ColNames>noteId</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<index id="57" parent="8" name="IDX_branches_parentNoteId"> <index id="57" parent="8" name="IDX_branches_parentNoteId">
<ColNames>parentNoteId</ColNames> <ColNames>parentNoteId</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<key id="58" parent="8"> <key id="58" parent="8">
<ColNames>branchId</ColNames> <ColNames>branchId</ColNames>
@ -248,7 +238,6 @@ parentNoteId</ColNames>
<index id="63" parent="9" name="sqlite_autoindex_event_log_1"> <index id="63" parent="9" name="sqlite_autoindex_event_log_1">
<NameSurrogate>1</NameSurrogate> <NameSurrogate>1</NameSurrogate>
<ColNames>eventId</ColNames> <ColNames>eventId</ColNames>
<ColumnCollations></ColumnCollations>
<Unique>1</Unique> <Unique>1</Unique>
</index> </index>
<key id="64" parent="9"> <key id="64" parent="9">
@ -301,16 +290,13 @@ parentNoteId</ColNames>
<index id="73" parent="10" name="sqlite_autoindex_links_1"> <index id="73" parent="10" name="sqlite_autoindex_links_1">
<NameSurrogate>1</NameSurrogate> <NameSurrogate>1</NameSurrogate>
<ColNames>linkId</ColNames> <ColNames>linkId</ColNames>
<ColumnCollations></ColumnCollations>
<Unique>1</Unique> <Unique>1</Unique>
</index> </index>
<index id="74" parent="10" name="IDX_links_noteId_index"> <index id="74" parent="10" name="IDX_links_noteId_index">
<ColNames>noteId</ColNames> <ColNames>noteId</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<index id="75" parent="10" name="IDX_links_targetNoteId_index"> <index id="75" parent="10" name="IDX_links_targetNoteId_index">
<ColNames>targetNoteId</ColNames> <ColNames>targetNoteId</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<key id="76" parent="10"> <key id="76" parent="10">
<ColNames>linkId</ColNames> <ColNames>linkId</ColNames>
@ -341,7 +327,6 @@ parentNoteId</ColNames>
<index id="81" parent="11" name="sqlite_autoindex_note_contents_1"> <index id="81" parent="11" name="sqlite_autoindex_note_contents_1">
<NameSurrogate>1</NameSurrogate> <NameSurrogate>1</NameSurrogate>
<ColNames>noteId</ColNames> <ColNames>noteId</ColNames>
<ColumnCollations></ColumnCollations>
<Unique>1</Unique> <Unique>1</Unique>
</index> </index>
<key id="82" parent="11"> <key id="82" parent="11">
@ -414,20 +399,16 @@ parentNoteId</ColNames>
<index id="95" parent="12" name="sqlite_autoindex_note_revisions_1"> <index id="95" parent="12" name="sqlite_autoindex_note_revisions_1">
<NameSurrogate>1</NameSurrogate> <NameSurrogate>1</NameSurrogate>
<ColNames>noteRevisionId</ColNames> <ColNames>noteRevisionId</ColNames>
<ColumnCollations></ColumnCollations>
<Unique>1</Unique> <Unique>1</Unique>
</index> </index>
<index id="96" parent="12" name="IDX_note_revisions_noteId"> <index id="96" parent="12" name="IDX_note_revisions_noteId">
<ColNames>noteId</ColNames> <ColNames>noteId</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<index id="97" parent="12" name="IDX_note_revisions_dateModifiedFrom"> <index id="97" parent="12" name="IDX_note_revisions_dateModifiedFrom">
<ColNames>utcDateModifiedFrom</ColNames> <ColNames>utcDateModifiedFrom</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<index id="98" parent="12" name="IDX_note_revisions_dateModifiedTo"> <index id="98" parent="12" name="IDX_note_revisions_dateModifiedTo">
<ColNames>utcDateModifiedTo</ColNames> <ColNames>utcDateModifiedTo</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<key id="99" parent="12"> <key id="99" parent="12">
<ColNames>noteRevisionId</ColNames> <ColNames>noteRevisionId</ColNames>
@ -498,7 +479,6 @@ parentNoteId</ColNames>
<index id="111" parent="13" name="sqlite_autoindex_notes_1"> <index id="111" parent="13" name="sqlite_autoindex_notes_1">
<NameSurrogate>1</NameSurrogate> <NameSurrogate>1</NameSurrogate>
<ColNames>noteId</ColNames> <ColNames>noteId</ColNames>
<ColumnCollations></ColumnCollations>
<Unique>1</Unique> <Unique>1</Unique>
</index> </index>
<key id="112" parent="13"> <key id="112" parent="13">
@ -540,7 +520,6 @@ parentNoteId</ColNames>
<index id="119" parent="14" name="sqlite_autoindex_options_1"> <index id="119" parent="14" name="sqlite_autoindex_options_1">
<NameSurrogate>1</NameSurrogate> <NameSurrogate>1</NameSurrogate>
<ColNames>name</ColNames> <ColNames>name</ColNames>
<ColumnCollations></ColumnCollations>
<Unique>1</Unique> <Unique>1</Unique>
</index> </index>
<key id="120" parent="14"> <key id="120" parent="14">
@ -576,7 +555,6 @@ parentNoteId</ColNames>
<index id="126" parent="15" name="sqlite_autoindex_recent_notes_1"> <index id="126" parent="15" name="sqlite_autoindex_recent_notes_1">
<NameSurrogate>1</NameSurrogate> <NameSurrogate>1</NameSurrogate>
<ColNames>branchId</ColNames> <ColNames>branchId</ColNames>
<ColumnCollations></ColumnCollations>
<Unique>1</Unique> <Unique>1</Unique>
</index> </index>
<key id="127" parent="15"> <key id="127" parent="15">
@ -597,7 +575,6 @@ parentNoteId</ColNames>
<index id="130" parent="16" name="sqlite_autoindex_source_ids_1"> <index id="130" parent="16" name="sqlite_autoindex_source_ids_1">
<NameSurrogate>1</NameSurrogate> <NameSurrogate>1</NameSurrogate>
<ColNames>sourceId</ColNames> <ColNames>sourceId</ColNames>
<ColumnCollations></ColumnCollations>
<Unique>1</Unique> <Unique>1</Unique>
</index> </index>
<key id="131" parent="16"> <key id="131" parent="16">
@ -660,12 +637,10 @@ parentNoteId</ColNames>
<index id="144" parent="19" name="IDX_sync_entityName_entityId"> <index id="144" parent="19" name="IDX_sync_entityName_entityId">
<ColNames>entityName <ColNames>entityName
entityId</ColNames> entityId</ColNames>
<ColumnCollations></ColumnCollations>
<Unique>1</Unique> <Unique>1</Unique>
</index> </index>
<index id="145" parent="19" name="IDX_sync_utcSyncDate"> <index id="145" parent="19" name="IDX_sync_utcSyncDate">
<ColNames>utcSyncDate</ColNames> <ColNames>utcSyncDate</ColNames>
<ColumnCollations></ColumnCollations>
</index> </index>
<key id="146" parent="19"> <key id="146" parent="19">
<ColNames>id</ColNames> <ColNames>id</ColNames>

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "trilium", "name": "trilium",
"version": "0.31.2-beta", "version": "0.31.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
src/public/javascripts/services/tree.js
View File

@ -585,7 +585,7 @@ async function createNewTopLevelNote() {
await createNote(rootNode, hoistedNoteId, "into"); await createNote(rootNode, hoistedNoteId, "into");
} }
async function createNote(node, parentNoteId, target, extraOptions) { async function createNote(node, parentNoteId, target, extraOptions = {}) {
utils.assertArguments(node, parentNoteId, target); utils.assertArguments(node, parentNoteId, target);
// if isProtected isn't available (user didn't enter password yet), then note is created as unencrypted // if isProtected isn't available (user didn't enter password yet), then note is created as unencrypted