composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°642 Portal: Flags on transition, fixed a bug with state form not reading DM flags correctly.

Browse Source 
SVN:trunk[4793]
This commit is contained in:
Guillaume Lajarige
2017-07-03 15:37:11 +00:00
parent 7c39a8baf1
commit 01de060093
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -527,9 +527,7 @@ class ObjectFormManager extends FormManager
if (array_key_exists($sAttCode, $aFieldsAtts)) if (array_key_exists($sAttCode, $aFieldsAtts))
{ {
// .. We merge them all // .. We merge them all
if($this->IsTransitionForm()) { $aFieldsAtts[$sAttCode] = $aFieldsAtts[$sAttCode] | $iFieldFlags;
$aFieldsAtts[$sAttCode] = $aFieldsAtts[$sAttCode] | $iFieldFlags;
}
} }
// - or it is mandatory and has no value // - or it is mandatory and has no value
if ((($iFieldFlags & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY) && ($this->oObject->Get($sAttCode) === '')) if ((($iFieldFlags & OPT_ATT_MANDATORY) === OPT_ATT_MANDATORY) && ($this->oObject->Get($sAttCode) === ''))