composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

(Retrofit from trunk) N°984 Portal: Fix autocomplete field reset when changing value of parent field in request templates.

Browse Source 
SVN:2.4[5262]
This commit is contained in:
Guillaume Lajarige
2018-01-16 15:39:44 +00:00
parent 985b366cc7
commit 25b1a0d8af
2 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
View File

@@ -19,7 +19,6 @@
namespace Combodo\iTop\Portal\Form; namespace Combodo\iTop\Portal\Form;
use Combodo\iTop\Form\Field\Field;
use \Exception; use \Exception;
use \Silex\Application; use \Silex\Application;
use \utils; use \utils;
@@ -41,6 +40,7 @@ use \AttributeDateTime;
use \AttachmentPlugIn; use \AttachmentPlugIn;
use \Combodo\iTop\Form\FormManager; use \Combodo\iTop\Form\FormManager;
use \Combodo\iTop\Form\Form; use \Combodo\iTop\Form\Form;
use \Combodo\iTop\Form\Field\Field;
use \Combodo\iTop\Form\Field\FileUploadField; use \Combodo\iTop\Form\Field\FileUploadField;
use \Combodo\iTop\Form\Field\LabelField; use \Combodo\iTop\Form\Field\LabelField;
use \Combodo\iTop\Portal\Helper\ApplicationHelper; use \Combodo\iTop\Portal\Helper\ApplicationHelper;
@@ -715,20 +715,7 @@ class ObjectFormManager extends FormManager
{ {
// Note: We can't do this in AttributeExternalKey::MakeFormField() in the Field::SetOnFinalizeCallback() because at this point we have no information about the portal scope and ignore_silos flag, hence it always applies silos. // Note: We can't do this in AttributeExternalKey::MakeFormField() in the Field::SetOnFinalizeCallback() because at this point we have no information about the portal scope and ignore_silos flag, hence it always applies silos.
// As a workaround we have to manually check if the field's current value is among the scope // As a workaround we have to manually check if the field's current value is among the scope
$oField->VerifyCurrentValue();
if(!$oField->GetReadOnly())
{
/** @var DBObjectSearch $oValuesScope */
$oValuesScope = $oField->GetSearch()->DeepClone();
$oBinaryExp = new BinaryExpression(new FieldExpression('id', $oValuesScope->GetClassAlias()), '=', new ScalarExpression($oField->GetCurrentValue()));
$oValuesScope->AddConditionExpression($oBinaryExp);
$oValuesSet = new DBObjectSet($oValuesScope);
if($oValuesSet->Count() === 0)
{
$oField->SetCurrentValue(null);
}
}
} }
// - Field that require processing on their subfields // - Field that require processing on their subfields
if (in_array(get_class($oField), array('Combodo\\iTop\\Form\\Field\\SubFormField'))) if (in_array(get_class($oField), array('Combodo\\iTop\\Form\\Field\\SubFormField')))
@@ -758,6 +745,11 @@ class ObjectFormManager extends FormManager
$oCustomField->SetSearchEndpoint($sSearchEndpoint); $oCustomField->SetSearchEndpoint($sSearchEndpoint);
} }
} }
// - Field that require to check if the current value is among allowed ones
if (in_array(get_class($oCustomField), array('Combodo\\iTop\\Form\\Field\\SelectObjectField')))
{
$oCustomField->VerifyCurrentValue();
}
} }
} }
} }
@@ -1204,5 +1196,4 @@ class ObjectFormManager extends FormManager
$oAttachment->DBDelete(); $oAttachment->DBDelete();
} }
} }
} }

30
sources/form/field/selectobjectfield.class.inc.php
View File

@@ -19,8 +19,12 @@
namespace Combodo\iTop\Form\Field; namespace Combodo\iTop\Form\Field;
use \Closure; use Closure;
use \DBSearch; use DBSearch;
use DBObjectSet;
use BinaryExpression;
use FieldExpression;
use ScalarExpression;
use Combodo\iTop\Form\Validator\NotEmptyExtKeyValidator; use Combodo\iTop\Form\Validator\NotEmptyExtKeyValidator;
/** /**
@@ -148,4 +152,26 @@ class SelectObjectField extends Field
{ {
return $this->sSearchEndpoint; return $this->sSearchEndpoint;
} }
/**
* Resets current value is not among allowed ones.
* By default, reset is done ONLY when the field is not read-only.
*
* @param boolean $bAlways Set to true to verify even when the field is read-only.
*/
public function VerifyCurrentValue($bAlways = false)
{
if(!$this->GetReadOnly() || $bAlways)
{
$oValuesScope = $this->GetSearch()->DeepClone();
$oBinaryExp = new BinaryExpression(new FieldExpression('id', $oValuesScope->GetClassAlias()), '=', new ScalarExpression($this->currentValue));
$oValuesScope->AddConditionExpression($oBinaryExp);
$oValuesSet = new DBObjectSet($oValuesScope);
if($oValuesSet->Count() === 0)
{
$this->currentValue = null;
}
}
}
} }