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

Retrofit from trunk

Browse Source 
N°1551 - Search: selected org & default criteria
Display the default search criteria also when an org is selected.
The org restriction criterion is read only.
[from revision 5939]

SVN:2.5[5943]
This commit is contained in:
Eric Espié
2018-07-17 12:22:09 +00:00
parent e184eb6aae
commit efa1f4ee43
2 changed files with 59 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/displayblock.class.inc.php
View File

@@ -326,7 +326,8 @@ class DisplayBlock
{
$aQueryParams = $aExtraParams['query_params'];
}
if ($this->m_sStyle != 'links')
// In case of search, the context filtering is done by the search itself
if (($this->m_sStyle != 'links') && ($this->m_sStyle != 'search'))
{
$oAppContext = new ApplicationContext();
$sClass = $this->m_oFilter->GetClass();