Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 02:16:05 +01:00
Code Issues Packages Projects Releases Activity

resort attributes for display

Browse Source
This commit is contained in:
zadam
2022-06-19 12:18:13 +02:00
parent 981fac8e50
commit 5ed1631a35
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/public/app/entities/note_short.js
View File

@@ -640,13 +640,18 @@ class NoteShort {
return []; return [];
} }
return this.getAttributes() const promotedAttrs = this.getAttributes()
.filter(attr => attr.isDefinition()) .filter(attr => attr.isDefinition())
.filter(attr => { .filter(attr => {
const def = attr.getDefinition(); const def = attr.getDefinition();
return def && def.isPromoted; return def && def.isPromoted;
}); });
// attrs are not resorted if position changes after initial load
promotedAttrs.sort((a, b) => a.position < b.position ? -1 : 1);
return promotedAttrs;
} }
hasAncestor(ancestorNoteId, visitedNoteIds = null) { hasAncestor(ancestorNoteId, visitedNoteIds = null) {

2
src/public/app/widgets/attribute_widgets/attribute_editor.js
View File

@@ -468,6 +468,8 @@ export default class AttributeEditorWidget extends NoteContextAwareWidget {
async renderOwnedAttributes(ownedAttributes, saved) { async renderOwnedAttributes(ownedAttributes, saved) {
ownedAttributes = ownedAttributes.filter(oa => !oa.isDeleted); ownedAttributes = ownedAttributes.filter(oa => !oa.isDeleted);
// attrs are not resorted if position changes after initial load
ownedAttributes.sort((a, b) => a.position < b.position ? -1 : 1);
let htmlAttrs = (await attributeRenderer.renderAttributes(ownedAttributes, true)).html(); let htmlAttrs = (await attributeRenderer.renderAttributes(ownedAttributes, true)).html();