zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-12-26 09:12:08 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/next61' into next61

Browse source
This commit is contained in:
zadam 2023-07-22 17:48:17 +02:00
commit 3aad0ebc95
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package-lock.json generated
View file

@ -5,7 +5,6 @@
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "trilium",
"version": "0.60.4", "version": "0.60.4",
"hasInstallScript": true, "hasInstallScript": true,
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",

4
src/public/app/widgets/ribbon_widgets/promoted_attributes.js
View file

@ -73,6 +73,10 @@ export default class PromotedAttributesWidget extends NoteContextAwareWidget {
const promotedDefAttrs = note.getPromotedDefinitionAttributes(); const promotedDefAttrs = note.getPromotedDefinitionAttributes();
const ownedAttributes = note.getOwnedAttributes(); const ownedAttributes = note.getOwnedAttributes();
// attrs are not resorted if position changes after the initial load
// promoted attrs are sorted primarily by order of definitions, but with multi-valued promoted attrs
// the order of attributes is important as well
ownedAttributes.sort((a, b) => a.position < b.position ? -1 : 1);
if (promotedDefAttrs.length === 0) { if (promotedDefAttrs.length === 0) {
this.toggleInt(false); this.toggleInt(false);