Merge branch 'pu/cw/fixEventTypeResolveing' into 'main'

fix(Calendar): event_types not resolved for reccuring events See merge request tine20/tine20!6608
tine-groupware · Feb 18, 2025 · 3f7f3ea · 3f7f3ea
2 parents 63f660c + f252a65
commit 3f7f3ea
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/tine20/Calendar/Convert/Event/Json.php b/tine20/Calendar/Convert/Event/Json.php
@@ -182,6 +182,11 @@ public function fromTine20RecordSet(Tinebase_Record_RecordSet $_records = NULL,
             return array();
         }
 
+        $mc = $_records->getFirstRecord()::getConfiguration();
+        $expander = new Tinebase_Record_Expander(Calendar_Model_Event::class, $mc->jsonExpander);
+        $expander->expand($_records);
+        $mc->setJsonExpander(null);
+
         if (null !== $_filter) {
             $rruleFilter = $_filter->getFilter('rrule', false, true);
             if ($rruleFilter && in_array($rruleFilter->getOperator(), ['in', 'notin'])) {