From c9a0d2bc80108fc8bd65b980df41f76e6fa17d63 Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Mon, 13 Jun 2016 12:36:12 +0000 Subject: [PATCH] Customer portal : Object search from attribute was crashing if object class had no friendlyname. SVN:trunk[4200] --- .../portal/src/controllers/objectcontroller.class.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php index fa003a3dc..b86a75824 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php @@ -804,7 +804,7 @@ class ObjectController extends AbstractController $aAttCodes = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetObjectClass, 'list')); // - Adding friendlyname attribute to the list is not already in it $sTitleAttCode = MetaModel::GetFriendlyNameAttributeCode($sTargetObjectClass); - if (!in_array($sTitleAttCode, $aAttCodes)) + if (($sTitleAttCode !== null) && !in_array($sTitleAttCode, $aAttCodes)) { $aAttCodes = array_merge(array($sTitleAttCode), $aAttCodes); } @@ -1042,7 +1042,7 @@ class ObjectController extends AbstractController // $aAttCodes = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetObjectClass, 'list')); // // - Adding friendlyname attribute to the list is not already in it // $sTitleAttrCode = MetaModel::GetFriendlyNameAttributeCode($sTargetObjectClass); -// if (!in_array($sTitleAttrCode, $aAttCodes)) +// if (($sTitleAttrCode !== null) && !in_array($sTitleAttrCode, $aAttCodes)) // { // $aAttCodes = array_merge(array($sTitleAttrCode), $aAttCodes); // }