mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-28 16:24:54 +02:00
#8134 Fixed search module
This commit is contained in:
parent
56ca01112d
commit
030938c78e
@ -950,10 +950,9 @@ class Tree
|
|||||||
$module_status_inner = '';
|
$module_status_inner = '';
|
||||||
$module_search_inner = '';
|
$module_search_inner = '';
|
||||||
$module_search_filter = '';
|
$module_search_filter = '';
|
||||||
|
|
||||||
if (!empty($this->filter['searchModule'])) {
|
if (!empty($this->filter['searchModule'])) {
|
||||||
$module_search_inner = '
|
$module_search_inner = '
|
||||||
INNER JOIN tagente_modulo tam
|
|
||||||
ON ta.id_agente = tam.id_agente
|
|
||||||
INNER JOIN tagente_estado tae
|
INNER JOIN tagente_estado tae
|
||||||
ON tae.id_agente_modulo = tam.id_agente_modulo';
|
ON tae.id_agente_modulo = tam.id_agente_modulo';
|
||||||
$module_search_filter = "AND tam.disabled = 0
|
$module_search_filter = "AND tam.disabled = 0
|
||||||
|
@ -32,6 +32,8 @@ class TreeOS extends Tree
|
|||||||
'tco.icon_name AS iconHTML',
|
'tco.icon_name AS iconHTML',
|
||||||
];
|
];
|
||||||
$this->L1inner = 'INNER JOIN tconfig_os tco ON tco.id_os = x2.g';
|
$this->L1inner = 'INNER JOIN tconfig_os tco ON tco.id_os = x2.g';
|
||||||
|
$this->L1innerInside = 'INNER JOIN tagente_modulo tam
|
||||||
|
ON ta.id_agente = tam.id_agente';
|
||||||
$this->L1orderByFinal = 'tco.name';
|
$this->L1orderByFinal = 'tco.name';
|
||||||
|
|
||||||
$this->L2condition = 'AND ta.id_os = '.$this->rootID;
|
$this->L2condition = 'AND ta.id_os = '.$this->rootID;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user