From b65e085c947159b42d4c8a9c2a8668095e0637b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cornelius=20Wei=C3=9F?= Date: Thu, 30 Jan 2025 20:27:20 +0100 Subject: [PATCH 1/2] tweak(Tinebase): separate hasNotes from hasUserNotes userNotes are data only --- tine20/Tinebase/js/data/Record.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tine20/Tinebase/js/data/Record.js b/tine20/Tinebase/js/data/Record.js index 634c0d89660..2ec708d6ba1 100644 --- a/tine20/Tinebase/js/data/Record.js +++ b/tine20/Tinebase/js/data/Record.js @@ -402,7 +402,7 @@ Tine.Tinebase.data.Record.create = function(o, meta) { f.getDataFields = function() { const systemFields = _.map(Tine.Tinebase.Model.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); }; From 4ed83aa9c1c9d5abfadb7b995aa34d2ed773b67d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cornelius=20Wei=C3=9F?= Date: Thu, 30 Jan 2025 20:27:56 +0100 Subject: [PATCH 2/2] fix(Tinebase) fix readOnly - data was not shown fixed fiedls fixate unresolved data as well, so let's use readOnly which is available now --- tine20/Tinebase/js/widgets/grid/PickerGridPanel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tine20/Tinebase/js/widgets/grid/PickerGridPanel.js b/tine20/Tinebase/js/widgets/grid/PickerGridPanel.js index e5c9dbe7926..36c1a0dd21a 100644 --- 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