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-4911-Informacion-mostrada-en-mapa-GIS-the-Satellite-Server' into 'develop' 

Ent 4911 informacion mostrada en mapa gis the satellite server

See merge request artica/pandorafms!2876
This commit is contained in:
Alejandro Fraguas 2019-12-23 10:24:10 +01:00
parent fa34170e34 c652f758f4
commit 7061ab81b6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/operation/gis_maps/ajax.php
View File

@ -302,7 +302,11 @@ switch ($opt) {
$osversion_offset = 0; $osversion_offset = 0;
} }
$row[] = ui_print_os_icon($agent['id_os'], true, true).'&nbsp;(<i><span title="'.$agent['os_version'].'">'.substr($agent['os_version'], $osversion_offset, 15).'</span></i>)'; if ($agent['os_version'] != '') {
$agent_os_version = '&nbsp;(<i><span title="'.$agent['os_version'].'">'.substr($agent['os_version'], $osversion_offset, 15).'</span></i>)';
}
$row[] = ui_print_os_icon($agent['id_os'], true, true).$agent_os_version;
$table->data[] = $row; $table->data[] = $row;
// URL // URL
@ -331,7 +335,12 @@ switch ($opt) {
// Agent version // Agent version
$row = []; $row = [];
$row[] = __('Agent Version'); if (strtolower(get_os_name($agent['id_os'])) == 'satellite') {
$row[] = __('Satellite Version');
} else {
$row[] = __('Agent Version');
}
$row[] = $agent['agent_version']; $row[] = $agent['agent_version'];
$table->data[] = $row; $table->data[] = $row;