Просмотр исходного кода

Prerequisites for custom fields

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3917 a333f486-631f-4898-b8df-5754b55c2be0
romainq 9 лет назад
Родитель
Сommit
7ad0b4f723
1 измененных файлов с 7 добавлено и 3 удалено
  1. 7 3
      sources/form/field/subformfield.class.inc.php

+ 7 - 3
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()