mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-31 01:35:36 +02:00
Fixed module type order field in agent view. Ticket #392
This commit is contained in:
parent
c527aa243b
commit
86e8e7fc1c
@ -465,11 +465,11 @@ if ($list_modules) {
|
|||||||
switch ($sort) {
|
switch ($sort) {
|
||||||
case 'up':
|
case 'up':
|
||||||
$selectTypeUp = $selected;
|
$selectTypeUp = $selected;
|
||||||
$order = array('field' => 'tagente_modulo.id_tipo_modulo', 'order' => 'ASC');
|
$order = array('field' => 'tagente_modulo.id_modulo', 'order' => 'ASC');
|
||||||
break;
|
break;
|
||||||
case 'down':
|
case 'down':
|
||||||
$selectTypeDown = $selected;
|
$selectTypeDown = $selected;
|
||||||
$order = array('field' => 'tagente_modulo.id_tipo_modulo', 'order' => 'DESC');
|
$order = array('field' => 'tagente_modulo.id_modulo', 'order' => 'DESC');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -634,7 +634,6 @@ if ($list_modules) {
|
|||||||
else
|
else
|
||||||
$count_modules = 0;
|
$count_modules = 0;
|
||||||
|
|
||||||
|
|
||||||
//Get monitors/modules
|
//Get monitors/modules
|
||||||
// Get all module from agent
|
// Get all module from agent
|
||||||
switch ($config["dbtype"]) {
|
switch ($config["dbtype"]) {
|
||||||
@ -652,7 +651,7 @@ if ($list_modules) {
|
|||||||
AND %s %s
|
AND %s %s
|
||||||
AND tagente_estado.estado != %d
|
AND tagente_estado.estado != %d
|
||||||
AND tagente_modulo.%s
|
AND tagente_modulo.%s
|
||||||
ORDER BY tmodule_group.name , %s %s",
|
ORDER BY tmodule_group.name , %s %s",
|
||||||
$id_agente, $status_text_monitor_sql,$status_module_group_filter,$status_filter_sql, $tags_sql, AGENT_MODULE_STATUS_NO_DATA,
|
$id_agente, $status_text_monitor_sql,$status_module_group_filter,$status_filter_sql, $tags_sql, AGENT_MODULE_STATUS_NO_DATA,
|
||||||
$status_module_group_filter, $order['field'], $order['order']);
|
$status_module_group_filter, $order['field'], $order['order']);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user