Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-06 05:15:59 +01:00
Code Issues Packages Projects Releases Activity

fixes for promoted attribute multiplicity

Browse Source
This commit is contained in:
zadam
2020-08-14 00:11:26 +02:00
parent f6f9f0d2c0
commit d9c246f8a7
4 changed files with 13 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/public/app/widgets/promoted_attributes.js
View File

@@ -51,7 +51,7 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
return;
}
const cells = [];
const $cells = [];
for (const definitionAttr of promotedDefAttrs) {
const valueType = definitionAttr.name.startsWith('label:') ? 'label' : 'relation';
@@ -68,20 +68,20 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
});
}
if (definitionAttr.value.multiplicity === 'single') {
if (definitionAttr.getDefinition().multiplicity === 'single') {
valueAttrs = valueAttrs.slice(0, 1);
}
for (const valueAttr of valueAttrs) {
const $cell = await this.createPromotedAttributeCell(definitionAttr, valueAttr, valueName);
cells.push($cell);
$cells.push($cell);
}
}
// we replace the whole content in one step so there can't be any race conditions
// (previously we saw promoted attributes doubling)
this.$container.empty().append(...cells);
this.$container.empty().append(...$cells);
this.toggleInt(true);
}
@@ -212,7 +212,7 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
return;
}
if (definition.multiplicity === "multivalue") {
if (definition.multiplicity === "multi") {
const addButton = $("<span>")
.addClass("bx bx-plus pointer")
.prop("title", "Add new attribute")
@@ -220,9 +220,9 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
const $new = await this.createPromotedAttributeCell(definitionAttr, {
attributeId: "",
type: valueAttr.type,
name: definitionAttr.name,
name: valueName,
value: ""
});
}, valueName);
$wrapper.after($new);
@@ -240,7 +240,11 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
$wrapper.remove();
});
$multiplicityCell.append(addButton).append(" &nbsp;").append(removeButton);
$multiplicityCell
.append(" &nbsp;")
.append(addButton)
.append(" &nbsp;")
.append(removeButton);
}
return $wrapper;