tweak(TB MC) improve json record set converter

tine-groupware · Aug 23, 2024 · 28bed7d · 28bed7d
1 parent de56354
commit 28bed7d
Showing 1 changed file with 21 additions and 4 deletions.
diff --git a/tine20/Tinebase/Model/Converter/JsonRecordSet.php b/tine20/Tinebase/Model/Converter/JsonRecordSet.php
@@ -44,7 +44,7 @@ public function convertToRecord($record, $key, $blob)
             $blob = json_decode($blob, true);
         }
         if (is_array($blob)) {
-            if ($this->refId) {
+            if ($this->refId && (empty($blob) || !($blob[key($blob)]['id'] ?? false))) {
                 return $blob;
             }
             $rs = new Tinebase_Record_RecordSet($record::getConfiguration()
@@ -61,6 +61,25 @@ public function convertToRecord($record, $key, $blob)
      */
     public function convertToData($record, $key, $fieldValue)
     {
+        if ($this->refId) {
+            if ($fieldValue instanceof Tinebase_Record_RecordSet) {
+                return json_encode($fieldValue->getArrayOfIds());
+            } elseif (is_array($fieldValue)) {
+                if ($fieldValue[key($fieldValue)]['id'] ?? false) {
+                    $ids = [];
+                    foreach ($fieldValue as $record) {
+                        if ($record['id'] ?? false) {
+                            $ids[] = $record['id'];
+                        }
+                    }
+                    $fieldValue = $ids;
+                }
+                return json_encode($fieldValue);
+            } else {
+                return null;
+            }
+        }
+
         if (! $fieldValue instanceof Tinebase_Record_RecordSet) {
             if (empty($fieldValue)) {
                 return null;
@@ -70,9 +89,7 @@ public function convertToData($record, $key, $fieldValue)
                 return $fieldValue;
             }
         }
-        if ($this->refId) {
-            return json_encode($fieldValue->getArrayOfIds());
-        }
+
         $fieldValue->runConvertToData();
         return json_encode($fieldValue->toArray());
     }