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

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

Browse Source 
SVN:trunk[4200]
This commit is contained in:
Guillaume Lajarige
2016-06-13 12:36:12 +00:00
parent 4a63989237
commit c9a0d2bc80
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -804,7 +804,7 @@ class ObjectController extends AbstractController
$aAttCodes = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetObjectClass, 'list')); $aAttCodes = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetObjectClass, 'list'));
// - Adding friendlyname attribute to the list is not already in it // - Adding friendlyname attribute to the list is not already in it
$sTitleAttCode = MetaModel::GetFriendlyNameAttributeCode($sTargetObjectClass); $sTitleAttCode = MetaModel::GetFriendlyNameAttributeCode($sTargetObjectClass);
if (!in_array($sTitleAttCode, $aAttCodes)) if (($sTitleAttCode !== null) && !in_array($sTitleAttCode, $aAttCodes))
{ {
$aAttCodes = array_merge(array($sTitleAttCode), $aAttCodes); $aAttCodes = array_merge(array($sTitleAttCode), $aAttCodes);
} }
@@ -1042,7 +1042,7 @@ class ObjectController extends AbstractController
// $aAttCodes = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetObjectClass, 'list')); // $aAttCodes = MetaModel::FlattenZList(MetaModel::GetZListItems($sTargetObjectClass, 'list'));
// // - Adding friendlyname attribute to the list is not already in it // // - Adding friendlyname attribute to the list is not already in it
// $sTitleAttrCode = MetaModel::GetFriendlyNameAttributeCode($sTargetObjectClass); // $sTitleAttrCode = MetaModel::GetFriendlyNameAttributeCode($sTargetObjectClass);
// if (!in_array($sTitleAttrCode, $aAttCodes)) // if (($sTitleAttrCode !== null) && !in_array($sTitleAttrCode, $aAttCodes))
// { // {
// $aAttCodes = array_merge(array($sTitleAttrCode), $aAttCodes); // $aAttCodes = array_merge(array($sTitleAttrCode), $aAttCodes);
// } // }