diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php index ab630ba577..bafe5deb78 100644 --- a/application/menunode.class.inc.php +++ b/application/menunode.class.inc.php @@ -618,6 +618,7 @@ class OQLMenuNode extends MenuNode protected $sPageTitle; protected $sOQL; protected $bSearch; + protected $bSearchFormOpen; /** * Extra parameters to be passed to the display block to fine tune its appearence @@ -637,12 +638,13 @@ class OQLMenuNode extends MenuNode * @param integer $iAllowedResults Expected "rights" for the action: either UR_ALLOWED_YES, UR_ALLOWED_NO, UR_ALLOWED_DEPENDS or a mix of them... * @return MenuNode */ - public function __construct($sMenuId, $sOQL, $iParentIndex, $fRank = 0, $bSearch = false, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null) + public function __construct($sMenuId, $sOQL, $iParentIndex, $fRank = 0, $bSearch = false, $sEnableClass = null, $iActionCode = null, $iAllowedResults = UR_ALLOWED_YES, $sEnableStimulus = null, $bSearchFormOpen = true) { parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus); $this->sPageTitle = "Menu:$sMenuId+"; $this->sOQL = $sOQL; $this->bSearch = $bSearch; + $this->bSearchFormOpen = $bSearchFormOpen; $this->m_aParams = array(); $this->aReflectionProperties['oql'] = $sOQL; $this->aReflectionProperties['do_search'] = $bSearch; @@ -671,7 +673,7 @@ class OQLMenuNode extends MenuNode Dict::S($this->sPageTitle), 'Menu_'.$this->GetMenuId(), $this->bSearch, // Search pane - true, // Search open + $this->bSearchFormOpen, // Search open $oPage, array_merge($this->m_aParams, $aExtraParams), true diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php index 0d093c180c..c3deb82188 100644 --- a/setup/compiler.class.inc.php +++ b/setup/compiler.class.inc.php @@ -1738,7 +1738,8 @@ EOF; case 'OQLMenuNode': $sOQL = self::QuoteForPHP($oMenu->GetChildText('oql')); $bSearch = ($oMenu->GetChildText('do_search') == '1') ? 'true' : 'false'; - $sNewMenu = "new OQLMenuNode('$sMenuId', $sOQL, $sParentSpec, $fRank, $bSearch);"; + $sSearchFormOpen = ($oMenu->GetChildText('search_form_open') == '1') ? 'true' : 'false'; + $sNewMenu = "new OQLMenuNode('$sMenuId', $sOQL, $sParentSpec, $fRank, $bSearch, $sSearchFormOpen);"; break; case 'NewObjectMenuNode':