| $sAdditionalStuff | {$sValidationField} |
| $sAdditionalStuff | {$sValidationSpan}{$sReloadSpan} |
| $sHeader$sPreviousLog | {$sValidationField} |
| $sHeader$sPreviousLog | {$sValidationSpan}{$sReloadSpan} |
| ';
+ $sHTMLValue .= ' ';
+ $sHTMLValue .= ' ';
+ $sHTMLValue .= '';
+ $sHTMLValue .= ' ';
+ $sHTMLValue .= ' | ';
+ $sHTMLValue .= ''.$sReloadSpan.' | '; // No validation span for this one: it does handle its own validation! + $sHTMLValue .= '
');
+ $('#fstatus_'+me.id).html('');
}
else
{
@@ -284,8 +282,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
// Query the server to get the form to create a target object
if (me.bSelectMode)
{
- me.v_html = $('#v_'+me.id).html();
- $('#v_'+me.id).html('');
+ $('#fstatus_'+me.id).html('');
}
else
{
@@ -336,7 +333,6 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
{
if (me.bSelectMode)
{
- $('#v_'+me.id).html(me.v_html);
}
else
{
@@ -446,8 +442,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
if (me.bSelectMode)
{
- me.v_html = $('#v_'+me.id).html();
- $('#v_'+me.id).html('');
+ $('#fstatus_'+me.id).html('');
}
else
{
@@ -501,7 +496,6 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
{
if (me.bSelectMode)
{
- $('#v_'+me.id).html(me.v_html);
}
else
{
diff --git a/js/field_set.js b/js/field_set.js
index e3d808d7f..22fbe7258 100644
--- a/js/field_set.js
+++ b/js/field_set.js
@@ -1,3 +1,20 @@
+// Copyright (C) 2010-2016 Combodo SARL
+//
+// This file is part of iTop.
+//
+// iTop is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// iTop is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with iTop. If not, see ');
+ $('#fstatus_'+sFieldId).html('');
+ $('#field_'+sFieldId).closest('td').block({message:''});
this.RequestAllowedValues(sAttCode);
index++;
}
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index b582cd26a..5495d868d 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -1,5 +1,5 @@
GetFieldsForDefaultValue() as $sAttCode)
{
$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
- $defaultValue = $oAttDef->GetDefaultValue();
+ $defaultValue = $oAttDef->GetDefaultValue($oObj);
$oWizardHelper->SetDefaultValue($sAttCode, $defaultValue);
$oObj->Set($sAttCode, $defaultValue);
}
@@ -2448,6 +2448,28 @@ EOF
}
}
break;
+
+ case 'custom_fields_update':
+ $oPage->SetContentType('application/json');
+ $sAttCode = utils::ReadParam('attcode', '');
+ $aRequestedFields = utils::ReadParam('requested_fields', array());
+ $sRequestedFieldsFormPath = utils::ReadParam('form_path', '');
+ $sJson = utils::ReadParam('json_obj', '', false, 'raw_data');
+
+ $oWizardHelper = WizardHelper::FromJSON($sJson);
+ $oObj = $oWizardHelper->GetTargetObject();
+
+ $oOrmCustomFieldValue = $oObj->Get($sAttCode);
+ $oForm = $oOrmCustomFieldValue->GetForm();
+ $oSubForm = $oForm->FindSubForm($sRequestedFieldsFormPath);
+ $oRenderer = new \Combodo\iTop\Renderer\Console\ConsoleFormRenderer($oSubForm);
+ $aRenderRes = $oRenderer->Render($aRequestedFields);
+
+ $aResult = array();
+ $aResult['form']['updated_fields'] = $aRenderRes;
+ $oPage->add(json_encode($aResult));
+ break;
+
default:
$oPage->p("Invalid query.");
}
diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index 460c58d47..543bfae4c 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -1206,6 +1206,10 @@ EOF;
$aParameters['min_up_mode'] = $this->GetMandatoryPropString($oField, 'min_up_mode');
$aParameters['min_up_type'] = $this->GetMandatoryPropString($oField, 'min_up_type');
}
+ elseif ($sAttType == 'AttributeCustomFields')
+ {
+ $aParameters['handler_class'] = $this->GetMandatoryPropString($oField, 'handler_class');
+ }
else
{
$aParameters['allowed_values'] = 'null'; // or "new ValueSetEnum('SELECT xxxx')"
diff --git a/sources/form/field/subformfield.class.inc.php b/sources/form/field/subformfield.class.inc.php
index 9f313fd3c..1048a13e7 100644
--- a/sources/form/field/subformfield.class.inc.php
+++ b/sources/form/field/subformfield.class.inc.php
@@ -61,7 +61,7 @@ class SubFormField extends Field
*/
public function Validate()
{
- $this->oForm->Validate();
+ return $this->oForm->Validate();
}
/**
@@ -106,4 +106,13 @@ class SubFormField extends Field
$this->oForm->SetCurrentValues($value);
return $this;
}
+
+ /**
+ * @param $sFormPath
+ * @return Form|null
+ */
+ public function FindSubForm($sFormPath)
+ {
+ return $this->oForm->FindSubForm($sFormPath);
+ }
}
diff --git a/sources/form/form.class.inc.php b/sources/form/form.class.inc.php
index 0b1d88a65..2490eb49d 100644
--- a/sources/form/form.class.inc.php
+++ b/sources/form/form.class.inc.php
@@ -19,6 +19,7 @@
namespace Combodo\iTop\Form;
+use Combodo\iTop\Form\Field\SubFormField;
use \Exception;
use \Dict;
use \Combodo\iTop\Form\Field\Field;
@@ -312,83 +313,108 @@ class Form
* @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;
- }
+ public function AddFieldDependency($sFieldId, $sDependsOnId)
+ {
+ if (!array_key_exists($sFieldId, $this->aDependencies))
+ {
+ $this->aDependencies[$sFieldId] = array();
+ }
+ $this->aDependencies[$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();
+
+ foreach ($this->aDependencies as $sImpactedFieldId => $aDependentFieldsIds)
+ {
+ foreach ($aDependentFieldsIds as $sDependentFieldId)
+ {
+ if (!array_key_exists($sDependentFieldId, $aRes))
+ {
+ $aRes[$sDependentFieldId] = array();
+ }
+ $aRes[$sDependentFieldId][] = $sImpactedFieldId;
+ }
+ }
+
+ return $aRes;
+ }
/**
- * 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
+ * @param $sFormPath
+ * @return Form|null
*/
- public function GetFieldsImpacts()
+ public function FindSubForm($sFormPath)
{
- $aRes = array();
-
- foreach ($this->aDependencies as $sImpactedFieldId => $aDependentFieldsIds)
+ $ret = null;
+ if ($sFormPath == $this->sId)
{
- foreach ($aDependentFieldsIds as $sDependentFieldId)
+ $ret = $this;
+ }
+ else
+ {
+ foreach ($this->aFields as $oField)
{
- if (!array_key_exists($sDependentFieldId, $aRes))
+ if ($oField instanceof SubFormField)
{
- $aRes[$sDependentFieldId] = array();
+ $ret = $oField->FindSubForm($sFormPath);
+ if ($ret !== null) break;
}
- $aRes[$sDependentFieldId][] = $sImpactedFieldId;
}
}
-
- return $aRes;
+ return $ret;
}
/**
*
*/
- 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();
- }
- }
+ 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();
+ 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());
- }
- }
- }
+ 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();
- }
+ return $this->GetValid();
+ }
}
diff --git a/sources/renderer/console/consoleformrenderer.class.inc.php b/sources/renderer/console/consoleformrenderer.class.inc.php
index 79da01cae..66d228a0e 100644
--- a/sources/renderer/console/consoleformrenderer.class.inc.php
+++ b/sources/renderer/console/consoleformrenderer.class.inc.php
@@ -33,7 +33,9 @@ class ConsoleFormRenderer extends FormRenderer
public function __construct(Form $oForm)
{
parent::__construct($oForm);
+ $this->AddSupportedField('HiddenField', 'ConsoleSimpleFieldRenderer');
$this->AddSupportedField('StringField', 'ConsoleSimpleFieldRenderer');
+ $this->AddSupportedField('SelectField', 'ConsoleSimpleFieldRenderer');
$this->AddSupportedField('SubFormField', 'ConsoleSubFormFieldRenderer');
}
}
\ No newline at end of file
diff --git a/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php b/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
index 3dc862aba..536c24830 100644
--- a/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
+++ b/sources/renderer/console/fieldrenderer/consolesimplefieldrenderer.class.inc.php
@@ -18,6 +18,7 @@
namespace Combodo\iTop\Renderer\Console\FieldRenderer;
+use Combodo\iTop\Form\Field\StringField;
use \Dict;
use Combodo\iTop\Renderer\FieldRenderer;
use Combodo\iTop\Renderer\RenderingOutput;
@@ -29,35 +30,60 @@ class ConsoleSimpleFieldRenderer extends FieldRenderer
$oOutput = new RenderingOutput();
$sFieldClass = get_class($this->oField);
- // 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())
+ if ($sFieldClass == 'Combodo\\iTop\\Form\\Field\\HiddenField')
{
- switch ($sFieldClass)
- {
- case 'Combodo\\iTop\\Form\\Field\\StringField':
- if ($this->oField->GetLabel() !== '')
- {
- $oOutput->AddHtml('');
- }
- $oOutput->AddHtml('');
- $oOutput->AddHtml('');
- break;
- }
+ $oOutput->AddHtml('');
}
- // ... and in read-only mode
else
{
+ $oOutput->AddHtml('| '); + } switch ($sFieldClass) { case 'Combodo\\iTop\\Form\\Field\\StringField': - if ($this->oField->GetLabel() !== '') + $oOutput->AddHtml(' | ');
+ if ($this->oField->GetReadOnly())
{
- $oOutput->AddHtml('');
+ $oOutput->AddHtml('');
+ $oOutput->AddHtml(''.htmlentities($this->oField->GetCurrentValue(), ENT_QUOTES, 'UTF-8').'');
}
- $oOutput->AddHtml(' ' . $this->oField->GetCurrentValue() . ' ');
+ else
+ {
+ $oOutput->AddHtml('');
+ }
+ $oOutput->AddHtml(' | ');
+ $oOutput->AddHtml('');
+ break;
+
+ case 'Combodo\\iTop\\Form\\Field\\SelectField':
+ $oOutput->AddHtml(''); + if ($this->oField->GetReadOnly()) + { + $aChoices = $this->oField->GetChoices(); + $sCurrentLabel = isset($aChoices[$this->oField->GetCurrentValue()]) ? $aChoices[$this->oField->GetCurrentValue()] : '' ; + $oOutput->AddHtml(''); + $oOutput->AddHtml(''.htmlentities($sCurrentLabel, ENT_QUOTES, 'UTF-8').''); + } + else + { + $oOutput->AddHtml(''); + } + $oOutput->AddHtml(' | '); break; } + $oOutput->AddHtml('