*/
@@ -31,12 +31,23 @@ class SubFormField extends Field
{
protected $oForm;
+ /**
+ * Default constructor
+ *
+ * @param string $sId
+ * @param string $sParentFormId
+ * @param Closure $onFinalizeCallback
+ */
public function __construct($sId, $sParentFormId, Closure $onFinalizeCallback = null)
{
$this->oForm = new Form($sParentFormId.'-subform_'.$sId);
parent::__construct($sId, $onFinalizeCallback);
}
+ /**
+ *
+ * @return \Combodo\iTop\Form\Form
+ */
public function GetForm()
{
return $this->oForm;
@@ -53,11 +64,19 @@ class SubFormField extends Field
$this->oForm->Validate();
}
+ /**
+ *
+ * @return boolean
+ */
public function GetValid()
{
return $this->oForm->GetValid();
}
+ /**
+ *
+ * @return array
+ */
public function GetErrorMessages()
{
$aRet = array();
@@ -68,13 +87,23 @@ class SubFormField extends Field
return $aRet;
}
+ /**
+ *
+ * @return array
+ */
public function GetCurrentValue()
{
return $this->oForm->GetCurrentValues();
}
+ /**
+ *
+ * @param array $value
+ * @return \Combodo\iTop\Form\Field\SubFormField
+ */
public function SetCurrentValue($value)
{
- return $this->oForm->SetCurrentValues($value);
+ $this->oForm->SetCurrentValues($value);
+ return $this;
}
}
diff --git a/sources/form/field/textareafield.class.inc.php b/sources/form/field/textareafield.class.inc.php
index e22d56594..cabf91240 100644
--- a/sources/form/field/textareafield.class.inc.php
+++ b/sources/form/field/textareafield.class.inc.php
@@ -28,5 +28,5 @@ use \Combodo\iTop\Form\Field\TextField;
*/
class TextAreaField extends TextField
{
-
+
}
diff --git a/sources/form/field/textfield.class.inc.php b/sources/form/field/textfield.class.inc.php
index 4919b4080..bd9b36b1b 100644
--- a/sources/form/field/textfield.class.inc.php
+++ b/sources/form/field/textfield.class.inc.php
@@ -29,26 +29,26 @@ use \Combodo\iTop\Form\Field\Field;
abstract class TextField extends Field
{
- /**
- * Checks the validators to see if the field's current value is valid.
- * Then sets $bValid and $aErrorMessages.
- *
- * @return boolean
- */
- public function Validate()
- {
- $this->SetValid(true);
- $this->EmptyErrorMessages();
- foreach ($this->GetValidators() as $oValidator)
- {
- if (!preg_match($oValidator->GetRegExp(true), $this->GetCurrentValue()))
- {
- $this->SetValid(false);
- $this->AddErrorMessage($oValidator->GetErrorMessage());
- }
- }
+ /**
+ * Checks the validators to see if the field's current value is valid.
+ * Then sets $bValid and $aErrorMessages.
+ *
+ * @return boolean
+ */
+ public function Validate()
+ {
+ $this->SetValid(true);
+ $this->EmptyErrorMessages();
+ foreach ($this->GetValidators() as $oValidator)
+ {
+ if (!preg_match($oValidator->GetRegExp(true), $this->GetCurrentValue()))
+ {
+ $this->SetValid(false);
+ $this->AddErrorMessage($oValidator->GetErrorMessage());
+ }
+ }
- return $this->GetValid();
- }
+ return $this->GetValid();
+ }
}
diff --git a/sources/form/form.class.inc.php b/sources/form/form.class.inc.php
index 587b7eae0..f197d7623 100644
--- a/sources/form/form.class.inc.php
+++ b/sources/form/form.class.inc.php
@@ -30,268 +30,343 @@ use \Combodo\iTop\Form\Field\Field;
*/
class Form
{
- protected $sId;
- protected $aFields;
- protected $aDependencies;
- protected $bValid;
- protected $aErrorMessages;
+ protected $sId;
+ protected $aFields;
+ protected $aDependencies;
+ protected $bValid;
+ protected $aErrorMessages;
- public function __construct($sId)
- {
- $this->sId = $sId;
- $this->aFields = array();
- $this->aDependencies = array();
- $this->bValid = true;
- $this->aErrorMessages = array();
- }
+ /**
+ * Default constructor
+ *
+ * @param string $sId
+ */
+ public function __construct($sId)
+ {
+ $this->sId = $sId;
+ $this->aFields = array();
+ $this->aDependencies = array();
+ $this->bValid = true;
+ $this->aErrorMessages = array();
+ }
- public function GetId()
- {
- return $this->sId;
- }
+ /**
+ *
+ * @return string
+ */
+ public function GetId()
+ {
+ return $this->sId;
+ }
- public function GetFields()
- {
- return $this->aFields;
- }
+ /**
+ *
+ * @return array
+ */
+ public function GetFields()
+ {
+ return $this->aFields;
+ }
- public function GetDependencies()
- {
- return $this->aDependencies;
- }
+ /**
+ *
+ * @return array
+ */
+ public function GetDependencies()
+ {
+ return $this->aDependencies;
+ }
- public function GetCurrentValues()
- {
- $aValues = array();
- foreach ($this->aFields as $sId => $oField)
- {
- $aValues[$sId] = $oField->GetCurrentValue();
- }
- return $aValues;
- }
+ /**
+ * Returns a hash array of "Field id" => "Field value"
+ *
+ * @return array
+ */
+ public function GetCurrentValues()
+ {
+ $aValues = array();
+ foreach ($this->aFields as $sId => $oField)
+ {
+ $aValues[$sId] = $oField->GetCurrentValue();
+ }
+ return $aValues;
+ }
- public function SetCurrentValues($aValues)
- {
- foreach ($aValues as $sId => $value)
- {
- $oField = $this->GetField($sId);
- $oField->SetCurrentValue($value);
- }
- }
+ /**
+ *
+ * @param array $aValues Must be a hash array of "Field id" => "Field value"
+ * @return \Combodo\iTop\Form\Form
+ */
+ public function SetCurrentValues($aValues)
+ {
+ foreach ($aValues as $sId => $value)
+ {
+ $oField = $this->GetField($sId);
+ $oField->SetCurrentValue($value);
+ }
- /**
- * Returns the current validation state of the form (true|false).
- * It DOESN'T make the validation, see Validate() instead.
- *
- * @return boolean
- */
- public function GetValid()
- {
- return $this->bValid;
- }
+ return $this;
+ }
- /**
- * Note : Function is protected as bValid should not be set from outside
- *
- * @param boolean $bValid
- * @return \Combodo\iTop\Form\Form
- */
- protected function SetValid($bValid)
- {
- $this->bValid = $bValid;
- return $this;
- }
+ /**
+ * Returns the current validation state of the form (true|false).
+ * It DOESN'T make the validation, see Validate() instead.
+ *
+ * @return boolean
+ */
+ public function GetValid()
+ {
+ return $this->bValid;
+ }
- public function GetErrorMessages()
- {
- return $this->aErrorMessages;
- }
+ /**
+ * Note : Function is protected as bValid should not be set from outside
+ *
+ * @param boolean $bValid
+ * @return \Combodo\iTop\Form\Form
+ */
+ protected function SetValid($bValid)
+ {
+ $this->bValid = $bValid;
+ return $this;
+ }
- /**
- * Note : Function is protected as aErrorMessages should not be set from outside
- *
- * @param array $aErrorMessages
- * @param string $sFieldId
- * @return \Combodo\iTop\Form\Form
- */
- protected function SetErrorMessages($aErrorMessages, $sFieldId = null)
- {
- if ($sFieldId === null)
- {
- $this->aErrorMessages = $aErrorMessages;
- }
- else
- {
- $this->aErrorMessages[$sFieldId] = $aErrorMessages;
- }
- return $this;
- }
+ /**
+ *
+ * @return array
+ */
+ public function GetErrorMessages()
+ {
+ return $this->aErrorMessages;
+ }
- /**
- * If $sFieldId is not set, the $sErrorMessage will be added to the general form messages
- *
- * Note : Function is protected as aErrorMessages should not be add from outside
- *
- * @param string $sErrorMessage
- * @param string $sFieldId
- * @return \Combodo\iTop\Form\Form
- */
- protected function AddErrorMessage($sErrorMessage, $sFieldId = '_main')
- {
- if (!isset($this->aErrorMessages[$sFieldId]))
- {
- $this->aErrorMessages[$sFieldId] = array();
- }
- $this->aErrorMessages[$sFieldId][] = $sErrorMessage;
- return $this;
- }
+ /**
+ * Note : Function is protected as aErrorMessages should not be set from outside
+ *
+ * @param array $aErrorMessages
+ * @param string $sFieldId
+ * @return \Combodo\iTop\Form\Form
+ */
+ protected function SetErrorMessages($aErrorMessages, $sFieldId = null)
+ {
+ if ($sFieldId === null)
+ {
+ $this->aErrorMessages = $aErrorMessages;
+ }
+ else
+ {
+ $this->aErrorMessages[$sFieldId] = $aErrorMessages;
+ }
+ return $this;
+ }
- /**
- * Note : Function is protected as aErrorMessages should not be set from outside
- *
- * @return \Combodo\iTop\Form\Form
- */
- protected function EmptyErrorMessages()
- {
- $this->aErrorMessages = array();
- return $this;
- }
+ /**
+ * If $sFieldId is not set, the $sErrorMessage will be added to the general form messages
+ *
+ * Note : Function is protected as aErrorMessages should not be add from outside
+ *
+ * @param string $sErrorMessage
+ * @param string $sFieldId
+ * @return \Combodo\iTop\Form\Form
+ */
+ protected function AddErrorMessage($sErrorMessage, $sFieldId = '_main')
+ {
+ if (!isset($this->aErrorMessages[$sFieldId]))
+ {
+ $this->aErrorMessages[$sFieldId] = array();
+ }
+ $this->aErrorMessages[$sFieldId][] = $sErrorMessage;
+ return $this;
+ }
- public function GetField($sId)
- {
- if (!array_key_exists($sId, $this->aFields))
- {
- throw new Exception('Field with ID "' . $sId . '" was not found in the Form.');
- }
- return $this->aFields[$sId];
- }
+ /**
+ * Note : Function is protected as aErrorMessages should not be set from outside
+ *
+ * @return \Combodo\iTop\Form\Form
+ */
+ protected function EmptyErrorMessages()
+ {
+ $this->aErrorMessages = array();
+ return $this;
+ }
- public function HasField($sId)
- {
- return array_key_exists($sId, $this->aFields);
- }
+ /**
+ *
+ * @param string $sId
+ * @return \Combodo\iTop\Form\Field\Field
+ * @throws Exception
+ */
+ public function GetField($sId)
+ {
+ if (!array_key_exists($sId, $this->aFields))
+ {
+ throw new Exception('Field with ID "' . $sId . '" was not found in the Form.');
+ }
+ return $this->aFields[$sId];
+ }
- public function AddField(Field $oField, $aDependsOnIds = array())
- {
- $oField->SetFormPath($this->sId);
- $this->aFields[$oField->GetId()] = $oField;
- return $this;
- }
+ /**
+ *
+ * @param string $sId
+ * @return boolean
+ */
+ public function HasField($sId)
+ {
+ return array_key_exists($sId, $this->aFields);
+ }
- public function RemoveField($sId)
- {
- if (array_key_exists($sId, $this->aFields))
- {
- unset($this->aFields[$sId]);
- }
- return $this;
- }
+ /**
+ *
+ * @param \Combodo\iTop\Form\Field\Field $oField
+ * @param array $aDependsOnIds
+ * @return \Combodo\iTop\Form\Form
+ */
+ public function AddField(Field $oField, $aDependsOnIds = array())
+ {
+ $oField->SetFormPath($this->sId);
+ $this->aFields[$oField->GetId()] = $oField;
+ return $this;
+ }
- /**
- * Returns a array (list) of the fields ordered by their dependencies.
- *
- * @return array
- */
- public function GetOrderedFields()
- {
- // TODO : Do this so it flatten the array
- return $this->aFields;
- }
+ /**
+ *
+ * @param string $sId
+ * @return \Combodo\iTop\Form\Form
+ */
+ public function RemoveField($sId)
+ {
+ if (array_key_exists($sId, $this->aFields))
+ {
+ unset($this->aFields[$sId]);
+ }
+ return $this;
+ }
- /**
- * Returns an array of field ids the $sFieldId depends on.
- *
- * @param string $sFieldId
- * @return array
- * @throws Exception
- */
- public function GetFieldDependencies($sFieldId)
- {
- if (!array_key_exists($sFieldId, $this->aDependencies))
- {
- throw new Exception('Field with ID "' . $sFieldId . '" had no dependancies declared in the Form.');
- }
- return $this->aDependencies[$sFieldId];
- }
+ /**
+ * Returns a array (list) of the fields ordered by their dependencies.
+ *
+ * @return array
+ */
+ public function GetOrderedFields()
+ {
+ // TODO : Do this so it flatten the array
+ return $this->aFields;
+ }
- public function AddFieldDependencies($sFieldId, array $aDependsOnIds)
- {
- foreach ($aDependsOnIds as $sDependsOnId)
- {
- $this->AddFieldDependency($sFieldId, $sDependsOnId);
- }
- return $this;
- }
+ /**
+ * Returns an array of field ids the $sFieldId depends on.
+ *
+ * @param string $sFieldId
+ * @return array
+ * @throws Exception
+ */
+ public function GetFieldDependencies($sFieldId)
+ {
+ if (!array_key_exists($sFieldId, $this->aDependencies))
+ {
+ throw new Exception('Field with ID "' . $sFieldId . '" had no dependancies declared in the Form.');
+ }
+ return $this->aDependencies[$sFieldId];
+ }
- public function AddFieldDependency($sFieldId, $sDependsOnId)
- {
- if (!array_key_exists($sFieldId, $this->aDependencies))
- {
- $this->aDependencies[$sFieldId] = array();
- }
- $this->aDependencies[$sFieldId][] = $sDependsOnId;
- return $this;
- }
+ /**
+ *
+ * @param string $sFieldId
+ * @param array $aDependsOnIds
+ * @return \Combodo\iTop\Form\Form
+ */
+ public function AddFieldDependencies($sFieldId, array $aDependsOnIds)
+ {
+ foreach ($aDependsOnIds as $sDependsOnId)
+ {
+ $this->AddFieldDependency($sFieldId, $sDependsOnId);
+ }
+ return $this;
+ }
- /**
- * Returns a hash array of the fields impacts on other fields. Key being the field that impacts the fields stored in the value as a regular array
- * (It kind of reversed the dependencies array)
- *
- * eg :
- * - 'service' => array('subservice', 'template')
- * - 'subservice' => array()
- * - ...
- *
- * @return array
- */
- public function GetFieldsImpacts()
- {
- $aRes = array();
+ /**
+ *
+ * @param string $sFieldId
+ * @param string $sDependsOnId
+ * @return \Combodo\iTop\Form\Form
+ */
+ public function AddFieldDependency($sFieldId, $sDependsOnId)
+ {
+ if (!array_key_exists($sFieldId, $this->aDependencies))
+ {
+ $this->aDependencies[$sFieldId] = array();
+ }
+ $this->aDependencies[$sFieldId][] = $sDependsOnId;
+ return $this;
+ }
- foreach ($this->aDependencies as $sImpactedFieldId => $aDependentFieldsIds)
- {
- foreach ($aDependentFieldsIds as $sDependentFieldId)
- {
- if (!array_key_exists($sDependentFieldId, $aRes))
- {
- $aRes[$sDependentFieldId] = array();
- }
- $aRes[$sDependentFieldId][] = $sImpactedFieldId;
- }
- }
+ /**
+ * Returns a hash array of the fields impacts on other fields. Key being the field that impacts the fields stored in the value as a regular array
+ * (It kind of reversed the dependencies array)
+ *
+ * eg :
+ * - 'service' => array('subservice', 'template')
+ * - 'subservice' => array()
+ * - ...
+ *
+ * @return array
+ */
+ public function GetFieldsImpacts()
+ {
+ $aRes = array();
- return $aRes;
- }
+ foreach ($this->aDependencies as $sImpactedFieldId => $aDependentFieldsIds)
+ {
+ foreach ($aDependentFieldsIds as $sDependentFieldId)
+ {
+ if (!array_key_exists($sDependentFieldId, $aRes))
+ {
+ $aRes[$sDependentFieldId] = array();
+ }
+ $aRes[$sDependentFieldId][] = $sImpactedFieldId;
+ }
+ }
- public function Finalize()
- {
- //TODO : Call GetOrderedFields
- // Must call OnFinalize on each fields, regarding the dependencies order
- // On a SubFormField, will call its own Finalize
- foreach ($this->aFields as $sId => $oField)
- {
- $oField->OnFinalize();
- }
- }
+ return $aRes;
+ }
- public function Validate()
- {
- $this->SetValid(true);
- $this->EmptyErrorMessages();
-
- foreach ($this->aFields as $oField)
- {
- if (!$oField->Validate())
- {
- $this->SetValid(false);
- foreach ($oField->GetErrorMessages() as $sErrorMessage)
- {
- $this->AddErrorMessage(Dict::S($sErrorMessage), $oField->Getid());
- }
- }
- }
-
- return $this->GetValid();
- }
+ /**
+ *
+ */
+ public function Finalize()
+ {
+ //TODO : Call GetOrderedFields
+ // Must call OnFinalize on each fields, regarding the dependencies order
+ // On a SubFormField, will call its own Finalize
+ foreach ($this->aFields as $sId => $oField)
+ {
+ $oField->OnFinalize();
+ }
+ }
+
+ /**
+ * Validate the form and return if it's valid or not
+ *
+ * @return boolean
+ */
+ public function Validate()
+ {
+ $this->SetValid(true);
+ $this->EmptyErrorMessages();
+
+ foreach ($this->aFields as $oField)
+ {
+ if (!$oField->Validate())
+ {
+ $this->SetValid(false);
+ foreach ($oField->GetErrorMessages() as $sErrorMessage)
+ {
+ $this->AddErrorMessage(Dict::S($sErrorMessage), $oField->Getid());
+ }
+ }
+ }
+
+ return $this->GetValid();
+ }
}
diff --git a/sources/form/formmanager.class.inc.php b/sources/form/formmanager.class.inc.php
index 26c23795a..8777f207a 100644
--- a/sources/form/formmanager.class.inc.php
+++ b/sources/form/formmanager.class.inc.php
@@ -29,72 +29,111 @@ use \Combodo\iTop\Renderer\FormRenderer;
*/
abstract class FormManager
{
- protected $oForm;
- protected $oRenderer;
-
- static function FromJSON($sJson)
- {
- // Overload in child class when needed
- $aJson = json_decode($sJson, true);
-
- $oFormManager = new static();
-
- $sFormRendererClass = $aJson['formrenderer_class'];
- $oFormRenderer = new $sFormRendererClass();
- $oFormRenderer->SetEndpoint($aJson['formrenderer_endpoint']);
- $oFormManager->SetRenderer($oFormRenderer);
-
- return $oFormManager;
- }
-
- public function __construct()
- {
- // Overload in child class when needed
- }
+ protected $oForm;
+ protected $oRenderer;
/**
- * @return Form
- */
- public function GetForm()
- {
- return $this->oForm;
- }
+ * Creates an instance of \Combodo\iTop\Form\FormManager from JSON data that must contain at least :
+ * - formrenderer_class : The class of the FormRenderer to use in the FormManager
+ * - formrenderer_endpoint : The endpoint of the renderer
+ *
+ * @param string $sJson
+ * @return \Combodo\iTop\Form\FormManager
+ */
+ static function FromJSON($sJson)
+ {
+ // Overload in child class when needed
+ $aJson = json_decode($sJson, true);
- /**
- * @return FormRenderer
- */
- public function GetRenderer()
- {
- return $this->oRenderer;
- }
+ $oFormManager = new static();
- public function SetRenderer(FormRenderer $oRenderer)
- {
- $this->oRenderer = $oRenderer;
- return $this;
- }
+ $sFormRendererClass = $aJson['formrenderer_class'];
+ $oFormRenderer = new $sFormRendererClass();
+ $oFormRenderer->SetEndpoint($aJson['formrenderer_endpoint']);
+ $oFormManager->SetRenderer($oFormRenderer);
- public function GetClass()
- {
- return get_class($this);
- }
+ return $oFormManager;
+ }
- public function ToJSON()
- {
- // Overload in child class when needed
- return array(
- 'id' => $this->oForm->GetId(),
- 'formmanager_class' => $this->GetClass(),
- 'formrenderer_class' => get_class($this->GetRenderer()),
- 'formrenderer_endpoint' => $this->GetRenderer()->GetEndpoint()
- );
- }
+ public function __construct()
+ {
+ // Overload in child class when needed
+ }
- abstract public function Build();
+ /**
+ *
+ * @return \Combodo\iTop\Form\Form
+ */
+ public function GetForm()
+ {
+ return $this->oForm;
+ }
- abstract public function OnUpdate($aArgs = null);
+ /**
+ *
+ * @param \Combodo\iTop\Form\Form $oForm
+ * @return \Combodo\iTop\Form\FormManager
+ */
+ public function SetForm(Form $oForm)
+ {
+ $this->oForm = $oForm;
+ return $this;
+ }
- abstract public function OnSubmit($aArgs = null);
+ /**
+ *
+ * @return \Combodo\iTop\Renderer\FormRenderer
+ */
+ public function GetRenderer()
+ {
+ return $this->oRenderer;
+ }
- abstract public function OnCancel($aArgs = null);
+ /**
+ *
+ * @param \Combodo\iTop\Renderer\FormRenderer $oRenderer
+ * @return \Combodo\iTop\Form\FormManager
+ */
+ public function SetRenderer(FormRenderer $oRenderer)
+ {
+ $this->oRenderer = $oRenderer;
+ return $this;
+ }
+
+ /**
+ *
+ * @return string
+ */
+ public function GetClass()
+ {
+ return get_class($this);
+ }
+
+ /**
+ * Creates a JSON string from the current object including :
+ * - id : Id of the current Form
+ * - formmanager_class
+ * - formrenderer_class
+ * - formrenderer_endpoint
+ *
+ * @return string
+ */
+ public function ToJSON()
+ {
+ // Overload in child class when needed
+ return array(
+ 'id' => $this->oForm->GetId(),
+ 'formmanager_class' => $this->GetClass(),
+ 'formrenderer_class' => get_class($this->GetRenderer()),
+ 'formrenderer_endpoint' => $this->GetRenderer()->GetEndpoint()
+ );
+ }
+
+ abstract public function Build();
+
+ abstract public function OnUpdate($aArgs = null);
+
+ abstract public function OnSubmit($aArgs = null);
+
+ abstract public function OnCancel($aArgs = null);
}
diff --git a/sources/form/validator/integervalidator.class.inc.php b/sources/form/validator/integervalidator.class.inc.php
index 23c8f7811..3effa2522 100644
--- a/sources/form/validator/integervalidator.class.inc.php
+++ b/sources/form/validator/integervalidator.class.inc.php
@@ -28,8 +28,8 @@ use \Combodo\iTop\Form\Validator\Validator;
*/
class IntegerValidator extends Validator
{
- const VALIDATOR_NAME = 'integer';
- const DEFAULT_REGEXP = '^[0-9]+$';
- const DEFAULT_ERROR_MESSAGE = 'TOTR: MUST NOT BE AN INTEGER MESSAGE';
+ const VALIDATOR_NAME = 'integer';
+ const DEFAULT_REGEXP = '^[0-9]+$';
+ const DEFAULT_ERROR_MESSAGE = 'TOTR: MUST NOT BE AN INTEGER MESSAGE';
}
diff --git a/sources/form/validator/mandatoryvalidator.class.inc.php b/sources/form/validator/mandatoryvalidator.class.inc.php
index 0279aef65..91c9a4af6 100644
--- a/sources/form/validator/mandatoryvalidator.class.inc.php
+++ b/sources/form/validator/mandatoryvalidator.class.inc.php
@@ -30,8 +30,8 @@ use \Combodo\iTop\Form\Validator\Validator;
*/
class MandatoryValidator extends Validator
{
- const VALIDATOR_NAME = 'mandatory';
- const DEFAULT_REGEXP = '.*\S.*';
- const DEFAULT_ERROR_MESSAGE = 'TOTR: MANDATORY MESSAGE';
+ const VALIDATOR_NAME = 'mandatory';
+ const DEFAULT_REGEXP = '.*\S.*';
+ const DEFAULT_ERROR_MESSAGE = 'TOTR: MANDATORY MESSAGE';
}
diff --git a/sources/form/validator/notemptyextkeyvalidator.class.inc.php b/sources/form/validator/notemptyextkeyvalidator.class.inc.php
index 8a268f4ad..569b1abad 100644
--- a/sources/form/validator/notemptyextkeyvalidator.class.inc.php
+++ b/sources/form/validator/notemptyextkeyvalidator.class.inc.php
@@ -28,8 +28,8 @@ use \Combodo\iTop\Form\Validator\Validator;
*/
class NotEmptyExtKeyValidator extends Validator
{
- const VALIDATOR_NAME = 'notemptyextkey';
- const DEFAULT_REGEXP = '^[1-9]+$';
- const DEFAULT_ERROR_MESSAGE = 'TOTR: MUST SELECT ONE';
+ const VALIDATOR_NAME = 'notemptyextkey';
+ const DEFAULT_REGEXP = '^[1-9]+$';
+ const DEFAULT_ERROR_MESSAGE = 'TOTR: MUST SELECT ONE';
}
diff --git a/sources/form/validator/notemptyvalidator.class.inc.php b/sources/form/validator/notemptyvalidator.class.inc.php
index edf36faef..dabb32d2b 100644
--- a/sources/form/validator/notemptyvalidator.class.inc.php
+++ b/sources/form/validator/notemptyvalidator.class.inc.php
@@ -28,8 +28,8 @@ use \Combodo\iTop\Form\Validator\Validator;
*/
class NotEmptyValidator extends Validator
{
- const VALIDATOR_NAME = 'notempty';
- const DEFAULT_REGEXP = '.*\S.*';
- const DEFAULT_ERROR_MESSAGE = 'TOTR: MUST NOT BE EMPTY MESSAGE';
+ const VALIDATOR_NAME = 'notempty';
+ const DEFAULT_REGEXP = '.*\S.*';
+ const DEFAULT_ERROR_MESSAGE = 'TOTR: MUST NOT BE EMPTY MESSAGE';
}
diff --git a/sources/form/validator/validator.class.inc.php b/sources/form/validator/validator.class.inc.php
index 9a8fa7bdf..a4414db44 100644
--- a/sources/form/validator/validator.class.inc.php
+++ b/sources/form/validator/validator.class.inc.php
@@ -26,83 +26,83 @@ namespace Combodo\iTop\Form\Validator;
*/
class Validator
{
- const VALIDATOR_NAME = 'expression';
- const DEFAULT_REGEXP = '';
- const DEFAULT_ERROR_MESSAGE = 'TOTR: Core:Validator:Default';
+ const VALIDATOR_NAME = 'expression';
+ const DEFAULT_REGEXP = '';
+ const DEFAULT_ERROR_MESSAGE = 'TOTR: Core:Validator:Default';
- protected $sRegExp;
- protected $sErrorMessage;
+ protected $sRegExp;
+ protected $sErrorMessage;
- public static function GetName()
- {
- return static::VALIDATOR_NAME;
- }
+ public static function GetName()
+ {
+ return static::VALIDATOR_NAME;
+ }
- /**
- *
- * @param Closure $callback (Used in the $oForm->AddField($sId, ..., function() use ($oManager, $oForm, '...') { ... } ); )
- */
- public function __construct($sRegExp = null, $sErrorMessage = null)
- {
- $this->sRegExp = ($sRegExp === null) ? static::DEFAULT_REGEXP : $sRegExp;
- $this->sErrorMessage = ($sErrorMessage === null) ? static::DEFAULT_ERROR_MESSAGE : $sErrorMessage;
- $this->ComputeConstraints();
- }
+ /**
+ *
+ * @param Closure $callback (Used in the $oForm->AddField($sId, ..., function() use ($oManager, $oForm, '...') { ... } ); )
+ */
+ public function __construct($sRegExp = null, $sErrorMessage = null)
+ {
+ $this->sRegExp = ($sRegExp === null) ? static::DEFAULT_REGEXP : $sRegExp;
+ $this->sErrorMessage = ($sErrorMessage === null) ? static::DEFAULT_ERROR_MESSAGE : $sErrorMessage;
+ $this->ComputeConstraints();
+ }
- /**
- * Returns the regular expression of the validator.
- *
- * @param boolean $bWithSlashes If true, surrounds $sRegExp with '/'. Used with preg_match & co
- * @return string
- */
- public function GetRegExp($bWithSlashes = false)
- {
- return ($bWithSlashes) ? '/' . $this->sRegExp . '/' : $this->sRegExp;
- }
+ /**
+ * Returns the regular expression of the validator.
+ *
+ * @param boolean $bWithSlashes If true, surrounds $sRegExp with '/'. Used with preg_match & co
+ * @return string
+ */
+ public function GetRegExp($bWithSlashes = false)
+ {
+ return ($bWithSlashes) ? '/' . $this->sRegExp . '/' : $this->sRegExp;
+ }
- public function GetErrorMessage()
- {
- return $this->sErrorMessage;
- }
+ public function GetErrorMessage()
+ {
+ return $this->sErrorMessage;
+ }
- public function SetRegExp($sRegExp)
- {
- $this->sRegExp = $sRegExp;
- $this->ComputeConstraints();
- return $this;
- }
+ public function SetRegExp($sRegExp)
+ {
+ $this->sRegExp = $sRegExp;
+ $this->ComputeConstraints();
+ return $this;
+ }
- public function SetErrorMessage($sErrorMessage)
- {
- $this->sErrorMessage = $sErrorMessage;
- $this->ComputeConstraints();
- return $this;
- }
+ public function SetErrorMessage($sErrorMessage)
+ {
+ $this->sErrorMessage = $sErrorMessage;
+ $this->ComputeConstraints();
+ return $this;
+ }
- /**
- * Computes the regular expression and error message when changing constraints on the validator.
- * Should be called in the validator's setters.
- */
- public function ComputeConstraints()
- {
- $this->ComputeRegularExpression();
- $this->ComputeErrorMessage();
- }
+ /**
+ * Computes the regular expression and error message when changing constraints on the validator.
+ * Should be called in the validator's setters.
+ */
+ public function ComputeConstraints()
+ {
+ $this->ComputeRegularExpression();
+ $this->ComputeErrorMessage();
+ }
- /**
- * Computes the regular expression when changing constraints on the validator.
- */
- public function ComputeRegularExpression()
- {
- // Overload when necessary
- }
+ /**
+ * Computes the regular expression when changing constraints on the validator.
+ */
+ public function ComputeRegularExpression()
+ {
+ // Overload when necessary
+ }
- /**
- * Computes the error message when changing constraints on the validator.
- */
- public function ComputeErrorMessage()
- {
- // Overload when necessary
- }
+ /**
+ * Computes the error message when changing constraints on the validator.
+ */
+ public function ComputeErrorMessage()
+ {
+ // Overload when necessary
+ }
}
diff --git a/sources/renderer/bootstrap/bsformrenderer.class.inc.php b/sources/renderer/bootstrap/bsformrenderer.class.inc.php
index 633059788..f0005d413 100644
--- a/sources/renderer/bootstrap/bsformrenderer.class.inc.php
+++ b/sources/renderer/bootstrap/bsformrenderer.class.inc.php
@@ -29,16 +29,22 @@ use \Combodo\iTop\Form\Form;
*/
class BsFormRenderer extends FormRenderer
{
- const DEFAULT_RENDERER_NAMESPACE = 'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\';
+ const DEFAULT_RENDERER_NAMESPACE = 'Combodo\\iTop\\Renderer\\Bootstrap\\FieldRenderer\\';
+
+ /**
+ * Default constructor
+ *
+ * @param \Combodo\iTop\Form\Form $oForm
+ */
+ public function __construct(Form $oForm = null)
+ {
+ parent::__construct($oForm);
+ $this->AddSupportedField('HiddenField', 'BsSimpleFieldRenderer');
+ $this->AddSupportedField('StringField', 'BsSimpleFieldRenderer');
+ $this->AddSupportedField('TextAreaField', 'BsSimpleFieldRenderer');
+ $this->AddSupportedField('SelectField', 'BsSimpleFieldRenderer');
+ $this->AddSupportedField('RadioField', 'BsSimpleFieldRenderer');
+ $this->AddSupportedField('CheckboxField', 'BsSimpleFieldRenderer');
+ }
- public function __construct(Form $oForm = null)
- {
- parent::__construct($oForm);
- $this->AddSupportedField('HiddenField', 'BsSimpleFieldRenderer');
- $this->AddSupportedField('StringField', 'BsSimpleFieldRenderer');
- $this->AddSupportedField('TextAreaField', 'BsSimpleFieldRenderer');
- $this->AddSupportedField('SelectField', 'BsSimpleFieldRenderer');
- $this->AddSupportedField('RadioField', 'BsSimpleFieldRenderer');
- $this->AddSupportedField('CheckboxField', 'BsSimpleFieldRenderer');
- }
}
diff --git a/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
index 1ca50a41d..c8bbfbf1b 100644
--- a/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
+++ b/sources/renderer/bootstrap/fieldrenderer/bssimplefieldrenderer.class.inc.php
@@ -31,201 +31,209 @@ use \Combodo\iTop\Renderer\RenderingOutput;
class BsSimpleFieldRenderer extends FieldRenderer
{
- public function Render()
- {
- $oOutput = new RenderingOutput();
- $sFieldClass = get_class($this->oField);
- $sFieldId = 'field_' . spl_object_hash($this->oField);
- $sFieldMandatoryClass = ($this->oField->GetMandatory()) ? 'form_mandatory' : '';
+ /**
+ * Returns a RenderingOutput for the FieldRenderer's Field
+ *
+ * @return \Combodo\iTop\Renderer\RenderingOutput
+ */
+ public function Render()
+ {
+ $oOutput = new RenderingOutput();
+ $sFieldClass = get_class($this->oField);
+ $sFieldMandatoryClass = ($this->oField->GetMandatory()) ? 'form_mandatory' : '';
- // TODO : Shouldn't we have a field type so we don't have to maintain FQN classname ?
- // Rendering field in edition mode
- if (!$this->oField->GetReadOnly())
- {
- switch ($sFieldClass)
- {
- case 'Combodo\\iTop\\Form\\Field\\StringField':
- $oOutput->AddHtml('');
- break;
+ // TODO : Shouldn't we have a field type so we don't have to maintain FQN classname ?
+ // Rendering field in edition mode
+ if (!$this->oField->GetReadOnly())
+ {
+ switch ($sFieldClass)
+ {
+ case 'Combodo\\iTop\\Form\\Field\\StringField':
+ $oOutput->AddHtml('');
+ break;
- case 'Combodo\\iTop\\Form\\Field\\TextAreaField':
- $oOutput->AddHtml('');
- break;
+ case 'Combodo\\iTop\\Form\\Field\\TextAreaField':
+ $oOutput->AddHtml('');
+ break;
- case 'Combodo\\iTop\\Form\\Field\\SelectField':
- $oOutput->AddHtml('');
- break;
+ case 'Combodo\\iTop\\Form\\Field\\SelectField':
+ $oOutput->AddHtml('');
+ break;
- case 'Combodo\\iTop\\Form\\Field\\RadioField':
- case 'Combodo\\iTop\\Form\\Field\\CheckboxField':
- $sFieldType = ($sFieldClass === 'Combodo\\iTop\\Form\\Field\\RadioField') ? 'radio' : 'checkbox';
+ case 'Combodo\\iTop\\Form\\Field\\RadioField':
+ case 'Combodo\\iTop\\Form\\Field\\CheckboxField':
+ $sFieldType = ($sFieldClass === 'Combodo\\iTop\\Form\\Field\\RadioField') ? 'radio' : 'checkbox';
- $oOutput->AddHtml('');
+ break;
- case 'Combodo\\iTop\\Form\\Field\\HiddenField':
- $oOutput->AddHtml('AddJs(
+ <<oField->GetGlobalId()}").off("change keyup").on("change keyup", function(){
+ var me = this;
+
+ $(this).closest(".field_set").trigger("field_change", {
+ id: $(me).attr("id"),
+ name: $(me).closest(".form_field").attr("data-field-id"),
+ value: $(me).val()
+ });
+ });
EOF
- );
- break;
+ );
+ break;
- case 'Combodo\\iTop\\Form\\Field\\RadioField':
- case 'Combodo\\iTop\\Form\\Field\\CheckboxField':
- $oOutput->AddJs(
-<<AddJs(
+ <<oField->GetGlobalId()} input").off("change").on("change", function(){
+ var me = this;
+
+ $(this).closest(".field_set").trigger("field_change", {
+ id: $(me).closest("#{$this->oField->GetGlobalId()}").attr("id"),
+ name: $(me).attr("name"),
+ value: $(me).val()
+ });
+ });
EOF
- );
- break;
- }
+ );
+ break;
+ }
- // JS Form field widget construct
- $aValidators = array();
- foreach ($this->oField->GetValidators() as $oValidator)
- {
- $aValidators[$oValidator::GetName()] = array(
- 'reg_exp' => $oValidator->GetRegExp(),
- 'message' => Dict::S($oValidator->GetErrorMessage())
- );
- }
+ // JS Form field widget construct
+ $aValidators = array();
+ foreach ($this->oField->GetValidators() as $oValidator)
+ {
+ $aValidators[$oValidator::GetName()] = array(
+ 'reg_exp' => $oValidator->GetRegExp(),
+ 'message' => Dict::S($oValidator->GetErrorMessage())
+ );
+ }
- $sFormFieldOptions = json_encode(array(
- 'validators' => $aValidators
- ));
+ $sFormFieldOptions = json_encode(array(
+ 'validators' => $aValidators
+ ));
- switch ($sFieldClass)
- {
- case 'Combodo\\iTop\\Form\\Field\\StringField':
- case 'Combodo\\iTop\\Form\\Field\\TextAreaField':
- case 'Combodo\\iTop\\Form\\Field\\SelectField':
- case 'Combodo\\iTop\\Form\\Field\\HiddenField':
- case 'Combodo\\iTop\\Form\\Field\\RadioField':
- case 'Combodo\\iTop\\Form\\Field\\CheckboxField':
- $oOutput->AddJs(
- <<AddJs(
+ <<oField = $oField;
- }
+ /**
+ * Default constructor
+ *
+ * @param \Combodo\iTop\Form\Field\Field $oField
+ */
+ public function __construct(Field $oField)
+ {
+ $this->oField = $oField;
+ }
- public function GetEndpoint()
- {
- return $this->sEndpoint;
- }
+ /**
+ *
+ * @return string
+ */
+ public function GetEndpoint()
+ {
+ return $this->sEndpoint;
+ }
- public function SetEndpoint($sEndpoint)
- {
- $this->sEndpoint = $sEndpoint;
- }
+ /**
+ *
+ * @param string $sEndpoint
+ */
+ public function SetEndpoint($sEndpoint)
+ {
+ $this->sEndpoint = $sEndpoint;
+ }
- /**
- * Renders a Field as a RenderingOutput
- *
- * @return \Combodo\iTop\Renderer\RenderingOutput
- */
- abstract public function Render();
+ /**
+ * Renders a Field as a RenderingOutput
+ *
+ * @return \Combodo\iTop\Renderer\RenderingOutput
+ */
+ abstract public function Render();
}
diff --git a/sources/renderer/formrenderer.class.inc.php b/sources/renderer/formrenderer.class.inc.php
index 2481ba23b..640a5442c 100644
--- a/sources/renderer/formrenderer.class.inc.php
+++ b/sources/renderer/formrenderer.class.inc.php
@@ -22,6 +22,7 @@ namespace Combodo\iTop\Renderer;
use \Exception;
use \Dict;
use \Combodo\iTop\Form\Form;
+use \Combodo\iTop\Form\Field\Field;
/**
* Description of FormRenderer
@@ -30,231 +31,272 @@ use \Combodo\iTop\Form\Form;
*/
abstract class FormRenderer
{
- const ENUM_RENDER_MODE_EXPLODED = 'exploded';
- const ENUM_RENDER_MODE_JOINED = 'joined';
- const DEFAULT_RENDERER_NAMESPACE = '';
+ const ENUM_RENDER_MODE_EXPLODED = 'exploded';
+ const ENUM_RENDER_MODE_JOINED = 'joined';
+ const DEFAULT_RENDERER_NAMESPACE = '';
- protected $oForm;
- protected $sEndpoint;
- protected $aSupportedFields;
- protected $sBaseLayout;
- protected $aOutputs;
+ protected $oForm;
+ protected $sEndpoint;
+ protected $aSupportedFields;
+ protected $sBaseLayout;
+ protected $aOutputs;
- /**
- * Default constructor
- *
- * @param \Combodo\iTop\Form\Form $oForm
- */
- public function __construct(Form $oForm = null)
- {
- if ($oForm !== null)
- {
- $this->oForm = $oForm;
- }
- $this->sBaseLayout = '';
- $this->InitOutputs();
- }
+ /**
+ * Default constructor
+ *
+ * @param \Combodo\iTop\Form\Form $oForm
+ */
+ public function __construct(Form $oForm = null)
+ {
+ if ($oForm !== null)
+ {
+ $this->oForm = $oForm;
+ }
+ $this->sBaseLayout = '';
+ $this->InitOutputs();
+ }
- public function GetForm()
- {
- return $this->oForm;
- }
+ /**
+ *
+ * @return \Combodo\iTop\Form\Form
+ */
+ public function GetForm()
+ {
+ return $this->oForm;
+ }
- public function SetForm($oForm)
- {
- $this->oForm = $oForm;
- return $this;
- }
+ /**
+ *
+ * @param \Combodo\iTop\Form\Form $oForm
+ * @return \Combodo\iTop\Renderer\FormRenderer
+ */
+ public function SetForm(Form $oForm)
+ {
+ $this->oForm = $oForm;
+ return $this;
+ }
- public function GetEndpoint()
- {
- return $this->sEndpoint;
- }
+ /**
+ *
+ * @return string
+ */
+ public function GetEndpoint()
+ {
+ return $this->sEndpoint;
+ }
- public function SetEndpoint($sEndpoint)
- {
- $this->sEndpoint = $sEndpoint;
- return $this;
- }
+ /**
+ *
+ * @param string $sEndpoint
+ * @return \Combodo\iTop\Renderer\FormRenderer
+ */
+ public function SetEndpoint($sEndpoint)
+ {
+ $this->sEndpoint = $sEndpoint;
+ return $this;
+ }
- public function GetBaseLayout()
- {
- return $this->sBaseLayout;
- }
+ /**
+ *
+ * @return string
+ */
+ public function GetBaseLayout()
+ {
+ return $this->sBaseLayout;
+ }
- public function SetBaseLayout($sBaseLayout)
- {
- $this->sBaseLayout = $sBaseLayout;
- return $this;
- }
+ /**
+ *
+ * @param string $sBaseLayout
+ * @return \Combodo\iTop\Renderer\FormRenderer
+ */
+ public function SetBaseLayout($sBaseLayout)
+ {
+ $this->sBaseLayout = $sBaseLayout;
+ return $this;
+ }
- public function GetFieldRendererClass($oField)
- {
- if (array_key_exists(get_class($oField), $this->aSupportedFields))
- {
- return $this->aSupportedFields[get_class($oField)];
- }
- else
- {
- throw new Exception('Field type not supported by the renderer: '.get_class($oField));
- }
- }
+ /**
+ *
+ * @param \Combodo\iTop\Form\Field\Field $oField
+ * @return string
+ * @throws Exception
+ */
+ public function GetFieldRendererClass(Field $oField)
+ {
+ if (array_key_exists(get_class($oField), $this->aSupportedFields))
+ {
+ return $this->aSupportedFields[get_class($oField)];
+ }
+ else
+ {
+ throw new Exception('Field type not supported by the renderer: ' . get_class($oField));
+ }
+ }
- /**
- * Returns the field identified by the id $sId in $this->oForm.
- *
- * @param string $sId
- * @return \Combodo\iTop\Renderer\FieldRenderer
- */
- public function GetFieldRendererClassFromId($sId)
- {
- return $this->GetFieldRendererClass($this->oForm->GetField($sId));
- }
+ /**
+ * Returns the field identified by the id $sId in $this->oForm.
+ *
+ * @param string $sId
+ * @return \Combodo\iTop\Renderer\FieldRenderer
+ */
+ public function GetFieldRendererClassFromId($sId)
+ {
+ return $this->GetFieldRendererClass($this->oForm->GetField($sId));
+ }
- /**
- *
- * @return array
- */
- public function GetOutputs()
- {
- return $this->aOutputs;
- }
+ /**
+ *
+ * @return array
+ */
+ public function GetOutputs()
+ {
+ return $this->aOutputs;
+ }
+ /**
+ * Registers a Renderer class for the specified Field class.
+ *
+ * If the Field class is not fully qualified, the default "Combodo\iTop\Form\Field" will be prepend.
+ * If the Field class already had a registered Renderer, it is replaced.
+ *
+ * @param string $sFieldClass
+ * @param string $sRendererClass
+ */
+ public function AddSupportedField($sFieldClass, $sRendererClass)
+ {
+ $sFieldClass = (strpos($sFieldClass, '\\') !== false) ? $sFieldClass : 'Combodo\\iTop\\Form\\Field\\' . $sFieldClass;
+ $sRendererClass = (strpos($sRendererClass, '\\') !== false) ? $sRendererClass : static::DEFAULT_RENDERER_NAMESPACE . $sRendererClass;
- /**
- * Registers a Renderer class for the specified Field class.
- *
- * If the Field class is not fully qualified, the default "Combodo\iTop\Form\Field" will be prepend.
- * If the Field class already had a registered Renderer, it is replaced.
- *
- * @param string $sFieldClass
- * @param string $sRendererClass
- */
- public function AddSupportedField($sFieldClass, $sRendererClass)
- {
- $sFieldClass = (strpos($sFieldClass, '\\') !== false) ? $sFieldClass : 'Combodo\\iTop\\Form\\Field\\' . $sFieldClass;
- $sRendererClass = (strpos($sRendererClass, '\\') !== false) ? $sRendererClass : static::DEFAULT_RENDERER_NAMESPACE . $sRendererClass;
+ $this->aSupportedFields[$sFieldClass] = $sRendererClass;
- $this->aSupportedFields[$sFieldClass] = $sRendererClass;
+ return $this;
+ }
- return $this;
- }
+ /**
+ *
+ * @return \Combodo\iTop\Renderer\FormRenderer
+ */
+ public function InitOutputs()
+ {
+ $this->aOutputs = array();
+ return $this;
+ }
- public function InitOutputs()
- {
- $this->aOutputs = array();
- return $this;
- }
+ /**
+ *
+ * @return array
+ */
+ public function Render()
+ {
+ $this->InitOutputs();
- public function Render()
- {
- $this->InitOutputs();
+ foreach ($this->oForm->GetFields() as $oField)
+ {
+ $this->aOutputs[$oField->GetId()] = $this->PrepareOutputForField($oField);
+ }
- foreach ($this->oForm->GetFields() as $oField)
- {
- $this->aOutputs[$oField->GetId()] = $this->PrepareOutputForField($oField);
- }
+ return $this->aOutputs;
+ }
- return $this->aOutputs;
- }
+ /**
+ * Returns the output for the $oField. Output format depends on the $sMode.
+ *
+ * If $sMode = 'exploded', output is an has array with id / html / js_inline / js_files / css_inline / css_files / validators
+ * Else if $sMode = 'joined', output is a string with everything in it
+ *
+ * @param \Combodo\iTop\Form\Field\Field $oField
+ * @param string $sMode 'exploded'|'joined'
+ * @return mixed
+ */
+ protected function PrepareOutputForField($oField, $sMode = 'exploded')
+ {
+ $output = array(
+ 'id' => $oField->GetId(),
+ 'html' => '',
+ 'js_inline' => '',
+ 'css_inline' => '',
+ 'js_files' => array(),
+ 'css_files' => array()
+ );
- /**
- * Returns the output for the $oField. Output format depends on the $sMode.
- *
- * If $sMode = 'exploded', output is an has array with id / html / js_inline / js_files / css_inline / css_files / validators
- * Else if $sMode = 'joined', output is a string with everything in it
- *
- * @param \Combodo\iTop\Form\Field\Field $oField
- * @param string $sMode 'exploded'|'joined'
- * @return mixed
- */
- protected function PrepareOutputForField($oField, $sMode = 'exploded')
- {
- $output = array(
- 'id' => $oField->GetId(),
- 'html' => '',
- 'js_inline' => '',
- 'css_inline' => '',
- 'js_files' => array(),
- 'css_files' => array()
- );
+ $sFieldRendererClass = $this->GetFieldRendererClass($oField);
- $sFieldRendererClass = $this->GetFieldRendererClass($oField);
+ $oFieldRenderer = new $sFieldRendererClass($oField);
+ $oFieldRenderer->SetEndpoint($this->GetEndpoint());
- $oFieldRenderer = new $sFieldRendererClass($oField);
- $oFieldRenderer->SetEndpoint($this->GetEndpoint());
+ $oRenderingOutput = $oFieldRenderer->Render();
- $oRenderingOutput = $oFieldRenderer->Render();
+ // HTML
+ if ($oRenderingOutput->GetHtml() !== '')
+ {
+ if ($sMode === static::ENUM_RENDER_MODE_EXPLODED)
+ {
+ $output['html'] = $oRenderingOutput->GetHtml();
+ }
+ else
+ {
+ $output['html'] .= $oRenderingOutput->GetHtml();
+ }
+ }
- // HTML
- if ($oRenderingOutput->GetHtml() !== '')
- {
- if ($sMode === static::ENUM_RENDER_MODE_EXPLODED)
- {
- $output['html'] = $oRenderingOutput->GetHtml();
- }
- else
- {
- $output['html'] .= $oRenderingOutput->GetHtml();
- }
- }
+ // JS files
+ foreach ($oRenderingOutput->GetJsFiles() as $sJsFile)
+ {
+ if ($sMode === static::ENUM_RENDER_MODE_EXPLODED)
+ {
+ if (!in_array($sJsFile, $output['js_files']))
+ {
+ $output['js_files'][] = $sJsFile;
+ }
+ }
+ else
+ {
+ $output['html'] .= '';
+ }
+ }
+ // JS inline
+ if ($oRenderingOutput->GetJs() !== '')
+ {
+ if ($sMode === static::ENUM_RENDER_MODE_EXPLODED)
+ {
+ $output['js_inline'] .= ' ' . $oRenderingOutput->GetJs();
+ }
+ else
+ {
+ $output['html'] .= '';
+ }
+ }
- // JS files
- foreach ($oRenderingOutput->GetJsFiles() as $sJsFile)
- {
- if ($sMode === static::ENUM_RENDER_MODE_EXPLODED)
- {
- if (!in_array($sJsFile, $output['js_files']))
- {
- $output['js_files'][] = $sJsFile;
- }
- }
- else
- {
- $output['html'] .= '';
- }
- }
- // JS inline
- if ($oRenderingOutput->GetJs() !== '')
- {
- if ($sMode === static::ENUM_RENDER_MODE_EXPLODED)
- {
- $output['js_inline'] .= ' ' . $oRenderingOutput->GetJs();
- }
- else
- {
- $output['html'] .= '';
- }
- }
+ // CSS files
+ foreach ($oRenderingOutput->GetCssFiles() as $sCssFile)
+ {
+ if ($sMode === static::ENUM_RENDER_MODE_EXPLODED)
+ {
+ if (!in_array($sCssFile, $output['css_files']))
+ {
+ $output['css_files'][] = $sCssFile;
+ }
+ }
+ else
+ {
+ $output['html'] .= '