Merge branch 'pu/ccheng/2023.11/broken_fmail_contact_grid' into '2023…

….11' fix(Felamimail/js): diasble responsive layout in felamimail contact grid See merge request tine20/tine20!4761
tine-groupware · Jan 15, 2024 · 6ef1783 · 6ef1783
2 parents 1089f82 + cb00869
commit 6ef1783
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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'),