diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index a0cbf37d5..37a6908da 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -475,6 +475,22 @@ abstract class cmdbAbstractObject extends CMDBObject } $sHtml .= '
| '.Dict::Format('UI:TruncatedResults', utils::GetConfig()->GetMinDisplayLimit(), $oSet->Count()).' '.Dict::S('UI:DisplayAll').' | '; + $oPage->add_ready_script("$('#{$divId} table.listResults').addClass('truncated');"); + $oPage->add_ready_script("$('#{$divId} table.listResults tr:last td').addClass('truncated');"); + } + else + { + // Full list + $sHtml .= ' |
| '.Dict::Format('UI:CountOfResults', $oSet->Count()).' | '; + } if ($bDisplayMenu) { $oMenuBlock = new MenuBlock($oSet->GetFilter()); @@ -485,22 +501,6 @@ abstract class cmdbAbstractObject extends CMDBObject //$aMenuExtraParams['linkage'] = $sLinkageAttribute; $aMenuExtraParams = $aExtraParams; } - if ($bDisplayLimit && ($oSet->Count() > utils::GetConfig()->GetMaxDisplayLimit())) - { - // list truncated - $divId = $aExtraParams['block_id']; - $sFilter = $oSet->GetFilter()->serialize(); - $aExtraParams['display_limit'] = false; // To expand the full list - $sExtraParams = addslashes(str_replace('"', "'", json_encode($aExtraParams))); // JSON encode, change the style of the quotes and escape them - $sHtml .= ' |
| '.Dict::Format('UI:TruncatedResults', utils::GetConfig()->GetMinDisplayLimit(), $oSet->Count()).' '.Dict::S('UI:DisplayAll').' | '; - $oPage->add_ready_script("$('#{$divId} table.listResults').addClass('truncated');"); - $oPage->add_ready_script("$('#{$divId} table.listResults tr:last td').addClass('truncated');"); - } - else - { - // Full list - $sHtml .= ' |
| '.Dict::Format('UI:CountOfResults', $oSet->Count()).' | '; - } $sHtml .= $oMenuBlock->GetRenderContent($oPage, $aMenuExtraParams); $sHtml .= ' |