advanced search - merged commit (since sourceforge has lost our commit, this is a manual merge all all losts)

SVN:trunk[5638]
This commit is contained in:
Bruno Da Silva
2018-04-12 12:29:32 +00:00
parent 7309c046ae
commit 0b8f75f799
15 changed files with 205 additions and 65 deletions

View File

@@ -128,12 +128,15 @@ function ReloadAndDisplay($oPage, $oObj, $sMessageId = '', $sMessage = '', $sSev
function DisplayDetails($oP, $sClass, $oObj, $id)
{
$sClassLabel = MetaModel::GetName($sClass);
$oSearch = new DBObjectSearch($sClass);
$oBlock = new DisplayBlock($oSearch, 'search', false);
$oBlock->Display($oP, 0, array(
'table_id' => 'search-widget-results-outer',
'open' => false,
));
// 2018-04-11 : removal of the search block
// $oSearch = new DBObjectSearch($sClass);
// $oBlock = new DisplayBlock($oSearch, 'search', false);
// $oBlock->Display($oP, 0, array(
// 'table_id' => 'search-widget-results-outer',
// 'open' => false,
// 'update_history' => false,
// ));
// The object could be listed, check if it is actually allowed to view it
$oSet = CMDBObjectSet::FromObject($oObj);