From 7c8edfd4676579489fe0e78b67a1be8768462eb8 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 7 Mar 2023 11:39:11 +0100
Subject: [PATCH] Exporter: unserialize JSON-encoded Basket objects

New baskets provide a Dictionary
---
 library/Director/Data/Exporter.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/library/Director/Data/Exporter.php b/library/Director/Data/Exporter.php
index 757374ea..575d7b8f 100644
--- a/library/Director/Data/Exporter.php
+++ b/library/Director/Data/Exporter.php
@@ -2,11 +2,13 @@
 
 namespace Icinga\Module\Director\Data;
 
+use gipfl\Json\JsonString;
 use gipfl\ZfDb\Adapter\Adapter;
 use Icinga\Module\Director\Data\Db\DbDataFormatter;
 use Icinga\Module\Director\Data\Db\DbObject;
 use Icinga\Module\Director\Data\Db\DbObjectWithSettings;
 use Icinga\Module\Director\Db;
+use Icinga\Module\Director\DirectorObject\Automation\Basket;
 use Icinga\Module\Director\Objects\DirectorDatafield;
 use Icinga\Module\Director\Objects\DirectorDatalist;
 use Icinga\Module\Director\Objects\DirectorDatalistEntry;
@@ -260,6 +262,11 @@ class Exporter
                 $props['settings'] = (object) $object->getSettings(); // Already sorted
             }
         }
+        if ($object instanceof Basket) {
+            if (isset($props['objects']) && is_string($props['objects'])) {
+                $props['objects'] = JsonString::decode($props['objects']);
+            }
+        }
         unset($props['uuid']); // Not yet
         if (! $this->showDefaults) {
             foreach ($props as $key => $value) {