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

Advanced Search

Browse Source 
SVN:b1162[5408]
This commit is contained in:
Eric Espié
2018-03-13 08:11:01 +00:00
parent d02fb69ca7
commit b3d625b9fc
6 changed files with 66 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,17 +53,20 @@ class SearchForm
$sHtml = '';
$oAppContext = new ApplicationContext();
$sClassName = $oSet->GetFilter()->GetClass();
$aListParams = array();
// Simple search form
if (isset($aExtraParams['currentId']))
{
$sSearchFormId = $aExtraParams['currentId'];
$aListParams['currentId'] = $aExtraParams['currentId'];
}
else
{
$iSearchFormId = $oPage->GetUniqueId();
$sSearchFormId = 'SimpleSearchForm'.$iSearchFormId;
$sHtml .= "<div id=\"ds_$sSearchFormId\" class=\"mini_tab{$iSearchFormId}\">\n";
$aListParams['currentId'] = "$iSearchFormId";
}
// Check if the current class has some sub-classes
if (isset($aExtraParams['baseClass']))
@@ -74,7 +77,6 @@ class SearchForm
{
$sRootClass = $sClassName;
}
$aListParams = array();
if (array_key_exists('selection_mode', $aExtraParams))
{
$aListParams['selection_mode'] = $aExtraParams['selection_mode'];
@@ -84,6 +86,18 @@ class SearchForm
$aListParams['selection_type'] = $aExtraParams['selection_type'];
}
$sJson = stripslashes(utils::ReadParam('json', '', false, 'raw_data'));
if (!empty($sJson))
{
$aListParams['json'] = json_decode($sJson, true);
}
if (array_key_exists('cssCount', $aExtraParams))
{
$aListParams['cssCount'] = $aExtraParams['cssCount'];
}
$aSubClasses = MetaModel::GetSubclasses($sRootClass);
if (count($aSubClasses) > 0)
{
@@ -126,6 +140,11 @@ class SearchForm
$aExtraParams['table_id'] = "search_form_result_{$sSearchFormId}";
$sHtml .= "<div class=\"display_block\" id=\"search_form_result_{$sSearchFormId}\"></div>\n";
}
$aListParams['table_id'] = $aExtraParams['table_id'];
if (array_key_exists('table_inner_id', $aExtraParams))
{
$aListParams['table_inner_id'] = $aExtraParams['table_inner_id'];
}
$aSearchParams = array(
'criterion_outer_selector' => "#fs_{$sSearchFormId}_criterion_outer",
'result_list_outer_selector' => "#{$aExtraParams['table_id']}",