diff --git a/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php b/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
index a5664f040..4530eba4a 100644
--- a/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
+++ b/sources/Application/UI/Base/Component/DataTable/DataTableUIBlockFactory.php
@@ -151,24 +151,27 @@ class DataTableUIBlockFactory extends AbstractUIBlockFactory
$iCount = $oSet->Count();
}
$oContainer = PanelUIBlockFactory::MakeForClass($oSet->GetClass(), '')->AddCSSClass('ibo-datatable-panel');
- if(isset($aExtraParams['panel_title'])){
- if(isset($aExtraParams['panel_title_is_html']) && $aExtraParams['panel_title_is_html'] === true) {
+ if (isset($aExtraParams['panel_title'])) {
+ if (isset($aExtraParams['panel_title_is_html']) && $aExtraParams['panel_title_is_html'] === true) {
$oContainer->AddTitleBlock(HtmlFactory::MakeRaw($aExtraParams['panel_title']));
- }
- else {
+ } else {
$oContainer->SetTitle($aExtraParams['panel_title']);
}
}
- if ($oDataTable->GetOption("select_mode") == 'multiple')
- {
- $sSubTitle =Dict::Format('UI:Pagination:HeaderSelection', ''.$iCount.'', '0');
+
+ $sCountHtml = ''.$iCount.'';
+ if ($oDataTable->GetOption('select_mode') === 'multiple') {
+ $sSubTitle = Dict::Format('UI:Pagination:HeaderSelection', $sCountHtml, '0');
+ } else {
+ $sSubTitle = Dict::Format('UI:Pagination:HeaderNoSelection', $sCountHtml);
}
- else
- {
- $sSubTitle = Dict::Format('UI:Pagination:HeaderNoSelection', ''.$iCount.'');
+ $sFilterListUrl = utils::GetDataTableSearchUrl($oSet->GetFilter(), $aExtraParams);
+ if (utils::IsNotNullOrEmptyString($sFilterListUrl)) {
+ $sSubTitle = ''.$sSubTitle.'';
}
+
$oContainer->AddSubTitleBlock(new Html($sSubTitle));
- if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){
+ if (isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0) {
$oContainer->SetIcon($aExtraParams["panel_icon"]);
}
$oContainer->AddToolbarBlock($oBlockMenu);