From 5ecf6b9e9dff6947a6fb5b77f547b4a9b8d262cb Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Tue, 28 Oct 2014 16:07:42 +0000 Subject: [PATCH] Fixed regression introduced in [3224] thus in iTop 2.0.3, in the data model view: could not see the OQL constraints on external keys SVN:trunk[3385] --- pages/schema.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pages/schema.php b/pages/schema.php index 01676ca78..102bafab3 100644 --- a/pages/schema.php +++ b/pages/schema.php @@ -450,7 +450,14 @@ function DisplayClassDetails($oPage, $sClass, $sContext) } $sAllowedValues = implode(', ', $aDescription); } - else $sAllowedValues = ''; + elseif (is_object($oAllowedValuesDef = $oAttDef->GetValuesDef())) + { + $sAllowedValues = $oAllowedValuesDef->GetValuesDescription(); + } + else + { + $sAllowedValues = ''; + } $aDetails[] = array('code' => $oAttDef->GetCode(), 'type' => $sType, 'origin' => $sOrigin, 'label' => $oAttDef->GetLabel(), 'description' => $sValue, 'values' => $sAllowedValues, 'moreinfo' => $sMoreInfo); }