Browse Source

Customer portal : Object search from attribute was crashing if object class had no friendlyname.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4200 a333f486-631f-4898-b8df-5754b55c2be0
glajarige 9 years ago
parent
commit
b3ffc8d09c

+ 2 - 2
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);
 //		}