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

fix validation issue + attribute not triggering change event on delete

Browse Source
This commit is contained in:
azivner
2018-08-13 09:39:07 +02:00
parent 297b536ebc
commit f071d3f651
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/entities/attribute.js
View File

@@ -8,7 +8,7 @@ const sql = require('../services/sql');
class Attribute extends Entity { class Attribute extends Entity {
static get tableName() { return "attributes"; } static get tableName() { return "attributes"; }
static get primaryKeyName() { return "attributeId"; } static get primaryKeyName() { return "attributeId"; }
static get hashedProperties() { return ["attributeId", "noteId", "type", "name", "value", "isInheritable", "dateCreated"]; } static get hashedProperties() { return ["attributeId", "noteId", "type", "name", "value", "isInheritable", "isDeleted", "dateCreated"]; }
constructor(row) { constructor(row) {
super(row); super(row);

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

@@ -227,7 +227,7 @@ function AttributesModel() {
this.isEmptyName = function(index) { this.isEmptyName = function(index) {
const cur = self.ownedAttributes()[index](); const cur = self.ownedAttributes()[index]();
return cur.name.trim() === "" && (cur.attributeId !== "" || cur.labelValue !== "" || cur.relationValue); return cur.name.trim() === "" && !cur.isDeleted && (cur.attributeId !== "" || cur.labelValue !== "" || cur.relationValue);
}; };
this.getTargetAttribute = function(target) { this.getTargetAttribute = function(target) {