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

N°642 Portal: Flags on transition part 2. Fixed a bug on transition with field that should have been must_xxx from DM

Browse Source 
SVN:trunk[4788]
This commit is contained in:
Guillaume Lajarige
2017-07-03 07:33:46 +00:00
parent a0259636b1
commit 9a56c3acfd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -510,9 +510,9 @@ class ObjectFormManager extends FormManager
// Skipping fields that were not specified to DM only list (garbage collector) // Skipping fields that were not specified to DM only list (garbage collector)
if($this->IsTransitionForm() && !array_key_exists($sAttCode, $aFieldsAtts)) if($this->IsTransitionForm() && !array_key_exists($sAttCode, $aFieldsAtts))
{ {
if( (($iFieldFlags & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY && $oAttDef->IsNull($this->oObject->Get($sAttCode))) if( (($value & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY && $oAttDef->IsNull($this->oObject->Get($sAttCode)))
|| (($iFieldFlags & OPT_ATT_MUSTPROMPT) === OPT_ATT_MUSTPROMPT) || (($value & OPT_ATT_MUSTPROMPT) === OPT_ATT_MUSTPROMPT)
|| (($iFieldFlags & OPT_ATT_MUSTCHANGE) === OPT_ATT_MUSTCHANGE)) || (($value & OPT_ATT_MUSTCHANGE) === OPT_ATT_MUSTCHANGE))
{ {
if(!in_array($sAttCode, $aFieldsDMOnlyAttCodes)) if(!in_array($sAttCode, $aFieldsDMOnlyAttCodes))
{ {