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

Merge branch 'ent-13087-Vista-de-agente-con-muchas-IP' into 'develop' 

collapsable area in agents ips

See merge request artica/pandorafms!7040
This commit is contained in:
Rafael Ameijeiras 2024-03-26 11:25:37 +00:00
parent 659e2b2db7 2b010aca6e
commit 76ad9571c9
2 changed files with 61 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pandora_console/include/functions_agents.php
View File

@ -2311,27 +2311,36 @@ function agents_get_agent_with_ip($ip_address)
/**
* Get all IP addresses of an agent
*
* @param int Agent id
* @param int Agent id
* @param bool Order by id
*
* @return array Array with the IP address of the given agent or an empty array.
*/
function agents_get_addresses($id_agent)
{
function agents_get_addresses(
$id_agent,
$order_by_id=false
) {
$order_clause = ($order_by_id === true) ? 'ORDER BY taddress.id_a DESC' : '';
if (is_array($id_agent)) {
$sql = sprintf(
'SELECT ip
FROM taddress_agent, taddress
WHERE taddress_agent.id_a = taddress.id_a
AND id_agent IN (%s)',
implode(',', $id_agent)
AND id_agent IN (%s)
%s',
implode(',', $id_agent),
$order_clause
);
} else {
$sql = sprintf(
'SELECT ip
FROM taddress_agent, taddress
WHERE taddress_agent.id_a = taddress.id_a
AND id_agent = %d',
$id_agent
AND id_agent = %d
%s',
$id_agent,
$order_clause
);
}

48
pandora_console/operation/agentes/estado_generalagente.php
View File

@ -142,7 +142,7 @@ if (empty($agent['os_version']) !== true) {
$table_status->data['agent_os_version'][1] = $os_agent_text;
}
$addresses = agents_get_addresses($id_agente);
$addresses = agents_get_addresses($id_agente, true);
$address = agents_get_address($id_agente);
foreach ($addresses as $k => $add) {
@ -154,8 +154,30 @@ foreach ($addresses as $k => $add) {
if (empty($address) === false) {
$address_text = '<span class="bolder" >'.$address.'</span>';
if (!empty($addresses) === true) {
foreach ($addresses as $sec_address) {
$address_text .= '<br/><span class="italic">'.$sec_address.'</span>';
if (count($addresses) > 3) {
$address_text .= '&nbsp&nbsp<span id="deploy_sec_ips_down">'.html_print_image(
'images/sort_down_black.png',
true,
['alt' => 'down']
).'</span><span id="deploy_sec_ips_up" style="display: none;">'.html_print_image(
'images/sort_up_black.png',
true,
['alt' => 'up']
).'</span>';
$address_text .= '<div id="secondary_ips" class="invisible">';
}
$first_key = key($addresses);
foreach ($addresses as $key => $sec_address) {
if ($first_key !== $key || count($addresses) <= 3) {
$address_text .= '<br/>';
}
$address_text .= '<span class="italic">'.$sec_address.'</span>';
}
if (count($addresses) > 3) {
$address_text .= '</div>';
}
}
@ -638,3 +660,23 @@ if (isset($table_interface) === true) {
true
);
}
?>
<script type="text/javascript">
$(document).ready (function () {
$('#deploy_sec_ips_up').on('click', function() {
$('#secondary_ips').hide();
// Avoid setting display block property with show/hide methods.
$('#deploy_sec_ips_up').css('display', 'none');
$('#deploy_sec_ips_down').css('display', '');
});
$('#deploy_sec_ips_down').on('click', function() {
$('#secondary_ips').show();
// Avoid setting display block property with show/hide methods.
$('#deploy_sec_ips_down').css('display', 'none');
$('#deploy_sec_ips_up').css('display', '');
});
});
</script>