From b97ce7a25f7e1ab1e1479cb072eadb18b8933243 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Mon, 1 Oct 2018 15:22:31 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B0917:=20Fix=20Ajax=20calls=20on=20objects?=
 =?UTF-8?q?=20containing=20AttributeSet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/wizardhelper.class.inc.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/application/wizardhelper.class.inc.php b/application/wizardhelper.class.inc.php
index 0f6def805..cc237b7f3 100644
--- a/application/wizardhelper.class.inc.php
+++ b/application/wizardhelper.class.inc.php
@@ -174,7 +174,7 @@ class WizardHelper
 					}
 					$oObj->Set($sAttCode, $value);
 				}
-				else if ($oAttDef instanceof AttributeSet) // AttributeDate is derived from AttributeDateTime
+				else if ($oAttDef instanceof AttributeTagSet) // AttributeDate is derived from AttributeDateTime
 				{
 					$value = json_decode($value, true);
 					$oTagSet = new ormTagSet(get_class($oObj), $sAttCode);
@@ -182,6 +182,14 @@ class WizardHelper
 					$oTagSet->ApplyDelta($value);
 					$oObj->Set($sAttCode, $oTagSet);
 				}
+				else if ($oAttDef instanceof AttributeSet) // AttributeDate is derived from AttributeDateTime
+				{
+					$value = json_decode($value, true);
+					$oTagSet = new ormSet(get_class($oObj), $sAttCode);
+					$oTagSet->SetValues($value['orig_value']);
+					$oTagSet->ApplyDelta($value);
+					$oObj->Set($sAttCode, $oTagSet);
+				}
 				else
 				{
 					$oObj->Set($sAttCode, $value);