Merge branch '2023.11' into 2024.11

tine-groupware · Feb 7, 2024 · 69e8d98 · 69e8d98
2 parents 7562adf + 056c6eb
commit 69e8d98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/tine20/Felamimail/js/ContactSearchCombo.js b/tine20/Felamimail/js/ContactSearchCombo.js
@@ -86,15 +86,6 @@ Tine.Felamimail.ContactSearchCombo = Ext.extend(Tine.Addressbook.SearchCombo, {
 
         filter.push({field: 'name_email_query', operator: 'contains', value: queryFilter.value});
     },
-
-    doQuery : function(q, forceAll){
-        // always load store otherwise the recipients will not be updated
-        this.store.load({
-            params: this.getParams(q)
-        });
-
-        Tine.Felamimail.ContactSearchCombo.superclass.doQuery.apply(this, arguments);
-    },
 
     /**
      * override default onSelect

diff --git a/tine20/Felamimail/js/RecipientGrid.js b/tine20/Felamimail/js/RecipientGrid.js
@@ -171,6 +171,10 @@ Tine.Felamimail.RecipientGrid = Ext.extend(Ext.grid.EditorGridPanel, {
             token.contact_record = contactData;
             await this.updateRecipientsToken(record, [token], record.get('type'));
         }, this);
+        // reload store otherwise the recipients will not be updated
+        this.searchCombo.store.load({
+            params: this.searchCombo.getParams('')
+        });
     },
 
     /**