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

@@ -175,12 +175,6 @@ class DataTable
$sJSOptions = json_encode($aOptions);
$oPage->add_ready_script("$('#datatable_{$this->iListId}').datatable($sJSOptions);");
if (isset($aExtraParams['update_history']) && true == $aExtraParams['update_history'])
{
$sFilter = json_encode(array('filter' => $this->oSet->GetFilter()->serialize()));
$oPage->add_ready_script("$('body').trigger('update_history.itop', [$sFilter])");
}
return $sHtml;
}