From 9a56c3acfdbd56fc40f5f86449ed1c3535eb815d Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Mon, 3 Jul 2017 07:33:46 +0000 Subject: [PATCH] =?UTF-8?q?N=C2=B0642=20Portal:=20Flags=20on=20transition?= =?UTF-8?q?=20part=202.=20Fixed=20a=20bug=20on=20transition=20with=20field?= =?UTF-8?q?=20that=20should=20have=20been=20must=5Fxxx=20from=20DM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SVN:trunk[4788] --- .../portal/src/forms/objectformmanager.class.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php index b39d480b61..109fb5fe2c 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php @@ -510,9 +510,9 @@ class ObjectFormManager extends FormManager // Skipping fields that were not specified to DM only list (garbage collector) if($this->IsTransitionForm() && !array_key_exists($sAttCode, $aFieldsAtts)) { - if( (($iFieldFlags & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY && $oAttDef->IsNull($this->oObject->Get($sAttCode))) - || (($iFieldFlags & OPT_ATT_MUSTPROMPT) === OPT_ATT_MUSTPROMPT) - || (($iFieldFlags & OPT_ATT_MUSTCHANGE) === OPT_ATT_MUSTCHANGE)) + if( (($value & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY && $oAttDef->IsNull($this->oObject->Get($sAttCode))) + || (($value & OPT_ATT_MUSTPROMPT) === OPT_ATT_MUSTPROMPT) + || (($value & OPT_ATT_MUSTCHANGE) === OPT_ATT_MUSTCHANGE)) { if(!in_array($sAttCode, $aFieldsDMOnlyAttCodes)) {