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

Advanced Search: Fix shortcut menu with sub-classes

Browse Source 
SVN:b1162[5465]
This commit is contained in:
Eric Espié
2018-03-20 12:50:30 +00:00
parent e33596960a
commit e120b149dc
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/utils.js
View File

@@ -170,7 +170,7 @@ function UpdateFileName(id, sNewFileName) {
/**
* Reload a search form for the specified class
*/
function ReloadSearchForm(divId, sClassName, sBaseClass, sContext) {
function ReloadSearchForm(divId, sClassName, sBaseClass, sContext, sTableId) {
var oDiv = $('#ds_'+divId);
oDiv.block();
// deprecated in jQuery 1.8
@@ -196,6 +196,7 @@ function ReloadSearchForm(divId, sClassName, sBaseClass, sContext) {
oMap.className = sClassName;
oMap.baseClass = sBaseClass;
oMap.currentId = divId;
oMap._table_id_ = sTableId;
oMap.action = sAction;
$.post(GetAbsoluteUrlAppRoot()+'pages/ajax.render.php?'+sContext, oMap,

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

@@ -107,7 +107,7 @@ class SearchForm
$aOptions[MetaModel::GetName($sClassName)] = "<option selected value=\"$sClassName\">".MetaModel::GetName($sClassName)."</options>\n";
ksort($aOptions);
$sContext = $oAppContext->GetForLink();
$sClassesCombo = "<select name=\"class\" onChange=\"ReloadSearchForm('$sSearchFormId', this.value, '$sRootClass', '$sContext')\">\n".implode('',
$sClassesCombo = "<select name=\"class\" onChange=\"ReloadSearchForm('$sSearchFormId', this.value, '$sRootClass', '$sContext', '{$aExtraParams['table_id']}')\">\n".implode('',
$aOptions)."</select>\n";
}
else
@@ -119,8 +119,8 @@ class SearchForm
$sHtml .= "<form id=\"fs_{$sSearchFormId}\" action=\"{$sAction}\" class=\"{$sStyle}\">\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php)
$sHtml .= "<h2 class=\"sf_title\"><span class=\"sft_picto fa fa-search\"></span>" . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "<a class=\"sft_toggler fa fa-caret-down pull-right\" href=\"#\" title=\"" . Dict::S('UI:Search:Toggle') . "\"></a><a class=\"sft_refresh fa fa-refresh pull-right\" href=\"#\" title=\"" . Dict::S('UI:Button:Refresh') . "\"></a></h2>\n";
$sHtml .= "<div id=\"fs_{$sSearchFormId}_message\" class=\"sf_message header_message\"></div>\n";
$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n";
$sHtml .= "</div>\n</form>\n";
$sHtml .= "<div id=\"fs_{$sSearchFormId}_criterion_outer\">\n</div>\n";
$sHtml .= "</form>\n";
$aFields = $this->GetFields($oSet);
$oSearch = $oSet->GetFilter();
@@ -145,7 +145,7 @@ class SearchForm
}
if (!array_key_exists('table_inner_id', $aExtraParams))
{
$aListParams['table_inner_id'] = uniqid('table_inner_id_');
$aListParams['table_inner_id'] = "table_inner_id_{$sSearchFormId}";
}
// When table_id is different of result_list_outer_selector
if (array_key_exists('table_id2', $aExtraParams))