From 08c6bb5c5ecb03e315bfc9b7eb93e6eb2c782102 Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Fri, 19 Feb 2016 11:11:09 +0000
Subject: [PATCH] Prerequisites for custom fields

SVN:trunk[3917]
---
 sources/form/field/subformfield.class.inc.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sources/form/field/subformfield.class.inc.php b/sources/form/field/subformfield.class.inc.php
index f45806c2b..5f18979b9 100644
--- a/sources/form/field/subformfield.class.inc.php
+++ b/sources/form/field/subformfield.class.inc.php
@@ -20,7 +20,6 @@
 namespace Combodo\iTop\Form\Field;
 
 use \Closure;
-use \Combodo\iTop\Form\Field\Field;
 use \Combodo\iTop\Form\Form;
 
 /**
@@ -34,7 +33,7 @@ class SubFormField extends Field
 
 	public function __construct($sId, $sParentFormId, Closure $onFinalizeCallback = null)
 	{
-		$this->oForm = new \Combodo\iTop\Form\Form($sParentFormId.'-subform_'.$sId);
+		$this->oForm = new Form($sParentFormId.'-subform_'.$sId);
 		parent::__construct($sId, $onFinalizeCallback);
 	}
 
@@ -61,7 +60,12 @@ class SubFormField extends Field
 
 	public function GetErrorMessages()
 	{
-		return $this->oForm->GetErrorMessages();
+		$aRet = array();
+		foreach ($this->oForm->GetErrorMessages() as $sSubFieldId => $aSubFieldMessages)
+		{
+			$aRet[] = $sSubFieldId.': '.implode(', ', $aSubFieldMessages);
+		}
+		return $aRet;
 	}
 
 	public function GetCurrentValue()