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

@@ -57,9 +57,10 @@ $sOperation = utils::ReadParam('operation', '');
$oP->SetBreadCrumbEntry('ui-tool-universalsearch', Dict::S('Menu:UniversalSearchMenu'), Dict::S('Menu:UniversalSearchMenu+'), '', utils::GetAbsoluteUrlAppRoot().'images/wrench.png');
// First part: select the class to search for
$oP->add("<form>");
$oP->add(Dict::S('UI:UniversalSearch:LabelSelectTheClass')."<select style=\"width: 150px;\" id=\"select_class\" name=\"baseClass\" onChange=\"this.form.submit();\">");
//$sSearchHeaderForceDropdown
$sSearchHeaderForceDropdown = '<select id="select_class" name="baseClass" onChange="this.form.submit();">';
$aClassLabels = array();
foreach(MetaModel::GetClasses('bizmodel') as $sCurrentClass)
{
@@ -70,11 +71,11 @@ foreach($aClassLabels as $sCurrentClass => $sLabel)
{
$sDescription = MetaModel::GetClassDescription($sCurrentClass);
$sSelected = ($sCurrentClass == $sBaseClass) ? " SELECTED" : "";
$oP->add("<option value=\"$sCurrentClass\" title=\"$sDescription\"$sSelected>$sLabel</option>");
$sSearchHeaderForceDropdown .= "<option value=\"$sCurrentClass\" title=\"$sDescription\"$sSelected>$sLabel</option>";
}
$oP->add("</select>\n");
$oP->add($oAppContext->GetForForm());
$oP->add("</form>\n");
$sSearchHeaderForceDropdown .= "</select>\n";
//end of $sSearchHeaderForceDropdown
try
{
@@ -111,6 +112,7 @@ if ($oFilter != null)
$aExtraParams['baseClass'] = $sBaseClass;
$aExtraParams['action'] = utils::GetAbsoluteUrlAppRoot().'pages/UniversalSearch.php';
$aExtraParams['table_id'] = '1';
$aExtraParams['search_header_force_dropdown'] = $sSearchHeaderForceDropdown;
//$aExtraParams['class'] = $sClassName;
$oBlock->Display($oP, 0, $aExtraParams);