From cb00869d1ec53ad53ff6940b56fa8a73e715a155 Mon Sep 17 00:00:00 2001 From: ccheng-dev Date: Mon, 15 Jan 2024 17:42:17 +0100 Subject: [PATCH] fix(Felamimail/js): diasble responsive layout in felamimail contact grid --- tine20/Felamimail/js/ContactGrid.js | 15 +++++++++------ .../GDPR/js/Felamimail/MessageEditDialogPlugin.js | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tine20/Felamimail/js/ContactGrid.js b/tine20/Felamimail/js/ContactGrid.js index beae0a5f105..578f0316783 100644 --- a/tine20/Felamimail/js/ContactGrid.js +++ b/tine20/Felamimail/js/ContactGrid.js @@ -53,6 +53,7 @@ Tine.Felamimail.ContactGridPanel = Ext.extend(Tine.Addressbook.ContactGridPanel, */ felamimailApp: null, + /** * inits this cmp * @private @@ -71,6 +72,7 @@ Tine.Felamimail.ContactGridPanel = Ext.extend(Tine.Addressbook.ContactGridPanel, Tine.Felamimail.ContactGridPanel.superclass.initComponent.call(this); + this.grid.disableResponsiveLayout = true; this.grid.on('rowdblclick', this.onRowDblClick, this); this.grid.on('cellclick', this.onCellClick, this); this.store.on('load', this.onContactStoreLoad, this); @@ -168,12 +170,13 @@ Tine.Felamimail.ContactGridPanel = Ext.extend(Tine.Addressbook.ContactGridPanel, if (Ext.isObject(this.messageRecord)) { _.each(records, (contact) => { const token = Tine.Felamimail.GridPanelHook.prototype.getRecipientTokenFromContact(contact); - - _.each(['to', 'cc', 'bcc'], async (type) => { - if (Ext.isArray(this.messageRecord.data[type]) && _.find(this.messageRecord.data[type], {email: token.email})) { - this.setTypeRadio(contact, type); - } - }); + if (token) { + ['to', 'cc', 'bcc'].forEach((type) => { + if (Ext.isArray(this.messageRecord.data[type]) && _.find(this.messageRecord.data[type], {email: token.email})) { + this.setTypeRadio(contact, type); + } + }); + } }) } }, diff --git a/tine20/GDPR/js/Felamimail/MessageEditDialogPlugin.js b/tine20/GDPR/js/Felamimail/MessageEditDialogPlugin.js index 9e5cb7b8072..7ce2907ec24 100644 --- a/tine20/GDPR/js/Felamimail/MessageEditDialogPlugin.js +++ b/tine20/GDPR/js/Felamimail/MessageEditDialogPlugin.js @@ -10,6 +10,7 @@ Tine.GDPR.Felamimail.MessageEditDialogPlugin.prototype = { this.app = Tine.Tinebase.appMgr.get('GDPR'); this.editDialog = editDialog; this.recipientGrid = this.editDialog.recipientGrid; + if (!this.recipientGrid) return; this.record = this.editDialog.record; this.manageConsentRecordPicker = new Tine.Tinebase.widgets.form.RecordPickerComboBox({ fieldLabel: this.app.i18n.gettext('Data Intended purpose of this mass mailing'),