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

N°1652 Fix broken search form when user has no read right on objects.

Browse Source
This commit is contained in:
Molkobain
2018-10-02 16:40:26 +02:00
parent 12e9e453d8
commit c5f3598f4e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sources/application/search/searchform.class.inc.php
View File

@@ -309,11 +309,16 @@ class SearchForm
$aSelectedClasses = $oSearch->GetSelectedClasses(); $aSelectedClasses = $oSearch->GetSelectedClasses();
foreach($aSelectedClasses as $sAlias => $sClassName) foreach($aSelectedClasses as $sAlias => $sClassName)
{ {
$aAllFields['zlist'] = array_merge($aAllFields['zlist'], $aAllFields[$sAlias.'_zlist']); if(array_key_exists($sAlias.'_zlist', $aAllFields))
unset($aAllFields[$sAlias.'_zlist']); {
$aAllFields['others'] = array_merge($aAllFields['others'], $aAllFields[$sAlias.'_others']); $aAllFields['zlist'] = array_merge($aAllFields['zlist'], $aAllFields[$sAlias.'_zlist']);
unset($aAllFields[$sAlias.'_others']); unset($aAllFields[$sAlias.'_zlist']);
}
if(array_key_exists($sAlias.'_others', $aAllFields))
{
$aAllFields['others'] = array_merge($aAllFields['others'], $aAllFields[$sAlias.'_others']);
unset($aAllFields[$sAlias.'_others']);
}
} }
return $aAllFields; return $aAllFields;