composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°4007 - When a search is on auto submit, auto submit it also on first display - new fix in order to avoid reload in case of OQLMenuNode

Browse Source
This commit is contained in:
acognet
2021-08-05 15:08:48 +02:00
parent 7d9b19cd9e
commit 3139628dd8
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
application/menunode.class.inc.php
View File

@@ -1133,7 +1133,6 @@ class OQLMenuNode extends MenuNode
$oBlock->Display($oPage, 0);
}
//$oPage->add("<p class=\"page-header\">$sIcon ".utils::HtmlEntities(Dict::S($sTitle))."</p>");
$oPage->add("<div class='sf_results_area' data-target='search_results'>");
$oTitle = TitleUIBlockFactory::MakeForPage($sTitle);
$oPage->AddUiBlock($oTitle);
@@ -1209,9 +1208,36 @@ class SearchMenuNode extends MenuNode
$oPage->SetBreadCrumbEntry("menu-".$this->sMenuId, $this->GetTitle(), '', '', 'fas fa-search', iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES);
$oSearch = new DBObjectSearch($this->sClass);
$aParams = array_merge(array('table_id' => 'Menu_'.utils::GetSafeId($this->GetMenuId())), $aExtraParams);
$sUsageId = 'Menu_'.utils::GetSafeId($this->GetMenuId());
$aParams = array_merge(array('table_id' =>$sUsageId), $aExtraParams);
$oBlock = new DisplayBlock($oSearch, 'search', false /* Asynchronous */, $aParams);
$oBlock->Display($oPage, 0);
$bAutoSubmit = true;
$mSubmitParam = utils::GetConfig()->Get('search_manual_submit');
if ($mSubmitParam !== false)
{
$bAutoSubmit = false;
}
else
{
$mSubmitParam = utils::GetConfig()->Get('high_cardinality_classes');
if (is_array($mSubmitParam)) {
if (in_array( $oSearch->GetClass(), $mSubmitParam)) {
$bAutoSubmit = false;
}
}
}
if($bAutoSubmit) {
$oPage->add("<div class='sf_results_area' data-target='search_results'>");
$aParams = array_merge(array('table_id' =>$sUsageId), $aExtraParams);
$oBlock = new DisplayBlock($oSearch, 'list', false /* Asynchronous */, $aParams);
$oBlock->Display($oPage, $sUsageId);
$oPage->add("</div>");
}
}
}

4
js/search/search_form_handler.js
View File

@@ -127,10 +127,10 @@ $(function()
});
// If auto submit is enabled, also submit on first display
if(this.options.auto_submit === true)
/*if(this.options.auto_submit === true)
{
this._submit();
}
}*/
},
// called when created, and later when changing options