tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed orders groups. Ticket #3926.

Browse Source
This commit is contained in:
Daniel Maya 2016-08-29 12:04:44 +02:00
parent 7ac687bf66
commit 0e53477fa7
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/godmode/agentes/module_manager.php
View File

@ -289,7 +289,7 @@ $sortField = get_parameter('sort_field');
$sort = get_parameter('sort', 'none'); $sort = get_parameter('sort', 'none');
$selected = 'border: 1px solid black;'; $selected = 'border: 1px solid black;';
$order[] = array('field' => 'id_module_group', 'order' => 'ASC'); $order[] = array('field' => 'tmodule_group.name', 'order' => 'ASC');
switch ($sortField) { switch ($sortField) {
case 'name': case 'name':
@ -452,7 +452,9 @@ switch ($config["dbtype"]) {
} }
$sql = sprintf("SELECT %s $sql = sprintf("SELECT %s
FROM tagente_modulo FROM tagente_modulo
WHERE %s %s %s %s %s", LEFT JOIN tmodule_group
ON tagente_modulo.id_module_group = tmodule_group.id_mg
WHERE %s %s %s %s %s",
$params, $basic_where, $where, $where_tags, $order_sql, $limit_sql); $params, $basic_where, $where, $where_tags, $order_sql, $limit_sql);
$modules = db_get_all_rows_sql($sql); $modules = db_get_all_rows_sql($sql);
@ -465,7 +467,9 @@ switch ($config["dbtype"]) {
} }
$sql = sprintf("SELECT %s $sql = sprintf("SELECT %s
FROM tagente_modulo FROM tagente_modulo
WHERE %s %s %s %s", LEFT JOIN tmodule_group
ON tmodule_group.id_mg = tagente_modulo.id_module_group
WHERE %s %s %s %s",
$params, $basic_where, $where, $where_tags, $order_sql); $params, $basic_where, $where, $where_tags, $order_sql);
$modules = oracle_recode_query ($sql, $set, 'AND', false); $modules = oracle_recode_query ($sql, $set, 'AND', false);
break; break;

6
pandora_console/include/ajax/module.php
View File

@ -618,7 +618,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 tagente_modulo.id_module_group , %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']);
@ -637,7 +637,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 tagente_modulo.id_module_group , %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']);
break; break;
@ -660,7 +660,7 @@ if ($list_modules) {
AND tagente_modulo.disabled = 0 AND tagente_modulo.disabled = 0
AND tagente_estado.estado != %d AND tagente_estado.estado != %d
AND tagente_modulo.%s AND tagente_modulo.%s
ORDER BY tagente_modulo.id_module_group , %s %s ORDER BY tmodule_group.name , %s %s
", $id_agente, $status_text_monitor_sql, $tags_sql, $status_filter_sql, AGENT_MODULE_STATUS_NO_DATA, ", $id_agente, $status_text_monitor_sql, $tags_sql, $status_filter_sql, AGENT_MODULE_STATUS_NO_DATA,
$status_module_group_filter, $order['field'], $order['order']); $status_module_group_filter, $order['field'], $order['order']);
break; break;