Merge branch '2024.11'

tine-groupware · Feb 7, 2025 · b3027ec · b3027ec
2 parents a4c2a8e + b903a4b
commit b3027ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tine20/Tinebase/js/data/Record.js b/tine20/Tinebase/js/data/Record.js
@@ -416,7 +416,7 @@ Record.create = function(o, meta) {
     f.getDataFields = function() {
         const systemFields = map(Record.genericFields, 'name')
             .concat(f.getMeta('idProperty'))
-            .concat(p.modelConfiguration?.hasNotes ? [] : 'notes')
+            .concat(p.modelConfiguration?.hasUserNotes ? [] : 'notes')
             .concat(p.modelConfiguration?.delegateAclField && p.grantsPath ? String(p.grantsPath).replace(/^data\./, '') : []);
         return difference(p.modelConfiguration?.fieldKeys, systemFields);
     };

diff --git a/tine20/Tinebase/js/widgets/grid/PickerGridPanel.js b/tine20/Tinebase/js/widgets/grid/PickerGridPanel.js
@@ -826,7 +826,7 @@ Tine.widgets.grid.PickerGridPanel = Ext.extend(Ext.grid.EditorGridPanel, {
                 openerCt: this,
                 record: JSON.stringify(record.getData()),
                 recordId: record.getId(),
-                fixedFields: this.readOnly ? JSON.stringify(Object.assign(Object.fromEntries(record.constructor.getFieldNames().map((k, i) => [k, null])), record.data)) : null,
+                readOnly: this.readOnly,
                 listeners: {
                     scope: me,
                     update: updateFn