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

N°2847 - Tranform old itop datatable to jquery DataTable - fix diplay

Browse Source
This commit is contained in:
acognet
2020-11-16 10:40:35 +01:00
parent 0046834b2c
commit 0a02c10287
6 changed files with 319 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,6 +182,8 @@ class SearchForm
}
}
}
$bShowObsoleteData = \appUserPreferences::GetPref('show_obsolete_data', MetaModel::GetConfig()->Get('obsolescence.show_obsolete_data'));// ? What to do when true == utils::IsArchiveMode()
$sAction = (isset($aExtraParams['action'])) ? $aExtraParams['action'] : utils::GetAbsoluteUrlAppRoot().'pages/UI.php';
$sStyle = "ibo-search-form";
@@ -191,13 +193,17 @@ class SearchForm
$oUiSearchBlock = new Panel(Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo), [],Panel::DEFAULT_COLOR, $sSearchFormId);
$oUiSearchBlock->SetCSSClasses("display_block");
$oUiBlock->AddSubBlock($oUiSearchBlock);
$sHtml = "<a class=\"sft_toggler fas fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a>";
$sHtml .= "<span class=\"pull-right\">";
$sHtml .= "<span class=\"sfobs_hint pull-right\">" . Dict::S('UI:Search:Obsolescence:DisabledHint') . "</span>";
$sHtml .= "<br class='clearboth' />";
$sHtml .= "<span class=\"sft_hint pull-right\">" . Dict::S('UI:Search:AutoSubmit:DisabledHint') . "</span>";
$sHtml .= "</span>";
if ($bShowObsoleteData)
{
$sHtml .= "<span class=\"pull-right\">";
$sHtml .= "<span class=\"sfobs_hint pull-right\">" . Dict::S('UI:Search:Obsolescence:DisabledHint') . "</span>";
}
if($bAutoSubmit === false) {
$sHtml .= "<br class='clearboth' />";
$sHtml .= "<span class=\"sft_hint pull-right\">".Dict::S('UI:Search:AutoSubmit:DisabledHint')."</span>";
$sHtml .= "</span>";
}
$sHtml .= "<br class='clearboth' />";
$oUiSearchBlock->AddToolbarBlock(new Html($sHtml));
@@ -283,8 +289,6 @@ class SearchForm
$sDateFormat = substr($sDateTimeFormat, 0, $iDateTimeSeparatorPos);
$sTimeFormat = substr($sDateTimeFormat, $iDateTimeSeparatorPos + 1);
$bShowObsoleteData = \appUserPreferences::GetPref('show_obsolete_data', MetaModel::GetConfig()->Get('obsolescence.show_obsolete_data'));// ? What to do when true == utils::IsArchiveMode()
$aSearchParams = array(
'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
'result_list_outer_selector' => "#{$aExtraParams['result_list_outer_selector']}",