fix creating new promoted attributes, closes #1008

(cherry picked from commit 2e0fb8aaf1)

src/entities/attribute.js

@@ -105,7 +105,6 @@ class Attribute extends Entity {
 
     // cannot be static!
     updatePojo(pojo) {
-        delete pojo.isOwned;
         delete pojo.__note;
     }
 
@@ -124,4 +123,4 @@ class Attribute extends Entity {
     }
 }
 
-module.exports = Attribute;
+module.exports = Attribute;

src/entities/note.js

@@ -411,10 +411,6 @@ class Note extends Entity {
             }
         });
 
-        for (const attr of filteredAttributes) {
-            attr.isOwned = attr.noteId === this.noteId;
-        }
-
         this.__attributeCache = filteredAttributes;
     }
 
@@ -946,4 +942,4 @@ class Note extends Entity {
     }
 }
 
-module.exports = Note;
+module.exports = Note;

src/public/app/dialogs/attributes.js

@@ -59,8 +59,8 @@ function AttributesModel() {
         });
     };
 
-    async function showAttributes(attributes) {
-        const ownedAttributes = attributes.filter(attr => attr.isOwned);
+    async function showAttributes(noteId, attributes) {
+        const ownedAttributes = attributes.filter(attr => attr.noteId === noteId);
 
         for (const attr of ownedAttributes) {
             attr.labelValue = attr.type === 'label' ? attr.value : '';
@@ -86,7 +86,7 @@ function AttributesModel() {
 
         addLastEmptyRow();
 
-        const inheritedAttributes = attributes.filter(attr => !attr.isOwned);
+        const inheritedAttributes = attributes.filter(attr => attr.noteId !== noteId);
 
         self.inheritedAttributes(inheritedAttributes);
     }
@@ -96,7 +96,7 @@ function AttributesModel() {
 
         const attributes = await server.get('notes/' + noteId + '/attributes');
 
-        await showAttributes(attributes);
+        await showAttributes(noteId, attributes);
 
         // attribute might not be rendered immediatelly so could not focus
         setTimeout(() => $(".attribute-type-select:last").trigger('focus'), 1000);
@@ -166,7 +166,7 @@ function AttributesModel() {
 
         const attributes = await server.put('notes/' + noteId + '/attributes', attributesToSave);
 
-        await showAttributes(attributes);
+        await showAttributes(noteId, attributes);
 
         toastService.showMessage("Attributes have been saved.");
     };
@@ -311,4 +311,4 @@ $dialog.on('focus', '.label-value', function (e) {
         $el: $(this),
         open: true
     })
-});
+});

src/public/app/widgets/promoted_attributes.js

@@ -19,6 +19,7 @@ const TPL = `
     
     .promoted-attributes td, .promoted-attributes th {
         padding: 5px;
+        min-width: 50px; /* otherwise checkboxes can collapse into 0 width (if there are only checkboxes) */
     }
     </style>
     
@@ -98,7 +99,7 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
         const $labelCell = $("<th>").append(valueAttr.name);
         const $input = $("<input>")
             .prop("tabindex", definitionAttr.position)
-            .prop("attribute-id", valueAttr.isOwned ? valueAttr.attributeId : '') // if not owned, we'll force creation of a new attribute instead of updating the inherited one
+            .prop("attribute-id", valueAttr.noteId === this.noteId ? valueAttr.attributeId : '') // if not owned, we'll force creation of a new attribute instead of updating the inherited one
             .prop("attribute-type", valueAttr.type)
             .prop("attribute-name", valueAttr.name)
             .prop("value", valueAttr.value)
@@ -266,4 +267,4 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
 
         $attr.prop("attribute-id", result.attributeId);
     }
-}
+}

src/routes/api/attributes.js

@@ -199,4 +199,4 @@ module.exports = {
     getEffectiveNoteAttributes,
     createRelation,
     deleteRelation
-};
+};