Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 09:56:36 +01:00
Code Issues Packages Projects Releases Activity

fixed UI for relation definition

Browse Source
This commit is contained in:
azivner
2018-08-05 20:48:56 +02:00
parent 2089c32839
commit 194ce4f10f
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/public/javascripts/dialogs/attributes.js
View File

@@ -57,12 +57,12 @@ function AttributesModel() {
for (const attr of attributes) {
attr.labelValue = attr.type === 'label' ? attr.value : '';
attr.relationValue = attr.type === 'relation' ? attr.value : '';
attr.labelDefinition = attr.type === 'label-definition' ? JSON.parse(attr.value) : {
attr.labelDefinition = (attr.type === 'label-definition' && attr.value) ? JSON.parse(attr.value) : {
labelType: "text",
multiplicityType: "singlevalue",
isPromoted: true
};
attr.relationDefinition = attr.type === 'relation-definition' ? JSON.parse(attr.value) : {
attr.relationDefinition = (attr.type === 'relation-definition' && attr.value) ? JSON.parse(attr.value) : {
multiplicityType: "singlevalue",
isPromoted: true
};
@@ -180,7 +180,11 @@ function AttributesModel() {
isDeleted: 0,
position: 0,
labelDefinition: {
valueType: "text",
labelType: "text",
multiplicityType: "singlevalue",
isPromoted: true
},
relationDefinition: {
multiplicityType: "singlevalue",
isPromoted: true
}
@@ -247,7 +251,7 @@ $dialog.on('focus', '.attribute-name', function (e) {
$(this).autocomplete({
source: async (request, response) => {
const attribute = attributesModel.getTargetAttribute(this);
const type = attribute().type === 'relation' ? 'relation' : 'label';
const type = (attribute().type === 'relation' || attribute().type === 'relation-definition') ? 'relation' : 'label';
const names = await server.get('attributes/names/?type=' + type + '&query=' + encodeURIComponent(request.term));
const result = names.map(name => {
return {