tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '995-Agent-name-en-operaciones-masivas-de-plugins-dev' into 'develop' 

changed agent name by alias

See merge request !566
This commit is contained in:
vgilc 2017-06-14 11:46:13 +02:00
parent c78711ba6f 95818e977e
commit 8f693ee9c8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/godmode/massive/massive_edit_plugins.php
View File

@ -63,13 +63,13 @@ if (is_ajax()) {
}
if ($get_agents) {
$sql = "SELECT ta.id_agente, ta.nombre AS agent_name,
$sql = "SELECT ta.id_agente, ta.alias AS agent_alias,
tam.nombre AS module_name
FROM tagente ta
INNER JOIN tagente_modulo tam
ON ta.id_agente = tam.id_agente
AND tam.id_plugin = $plugin_id
ORDER BY ta.nombre, tam.nombre";
ORDER BY ta.alias, tam.nombre";
$result = db_get_all_rows_sql($sql);
if (empty($result)) $result = array();
@ -78,7 +78,7 @@ if (is_ajax()) {
$current_element = array();
foreach ($result as $key => $value) {
$id = (int) $value['id_agente'];
$name = $value['agent_name'];
$name = io_safe_output($value['agent_alias']);
$module_name = $value['module_name'];
if (!empty($current_element) && $current_element['id'] !== $id) {