Merge branch '2023.11' into 2024.11

tine-groupware · Feb 26, 2025 · 1fb59a7 · 1fb59a7
2 parents 6de039c + 80abea9
commit 1fb59a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/tine20/Addressbook/Controller/Contact.php b/tine20/Addressbook/Controller/Contact.php
@@ -113,7 +113,8 @@ public function get($_id, $_containerId = NULL, $_getRelatedData = TRUE, $_getDe
         if ($_id) {
             $listController = Addressbook_Controller_List::getInstance();
             $groups = $listController->getMemberships($_id);
-            $contact->groups = $listController->search(Tinebase_Model_Filter_FilterGroup::getFilterForModel(Addressbook_Model_List::class, [
+            // we remove the list members, so we can do the search on the backend, its way more efficient
+            $contact->groups = $listController->getBackend()->search(Tinebase_Model_Filter_FilterGroup::getFilterForModel(Addressbook_Model_List::class, [
                 ['field' => 'id', 'operator' => 'in', 'value' => $groups]
             ]));
             $contact->groups->members = null;

diff --git a/tine20/Addressbook/Controller/List.php b/tine20/Addressbook/Controller/List.php
@@ -193,7 +193,7 @@ public function search(Tinebase_Model_Filter_FilterGroup $_filter = NULL, Tineba
     {
         $result = parent::search($_filter, $_pagination, $_getRelations, $_onlyIds, $_action);
 
-        if ($_onlyIds !== true) {
+        if ($result instanceof Tinebase_Record_RecordSet) {
             $this->_removeHiddenListMembers($result);
         }