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

2013-02-28 Miguel de Dios <miguel.dedios@artica.es> 

* operation/gis_maps/render_view.php: fixed the mysql error
	messages when have a "none" for group in a layer.
	
	MERGED FROM THE BRANCH PANDORA_4




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7746 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-02-28 12:55:40 +00:00
parent a7a4ebbdc6
commit 1a952ae78a
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-02-28 Miguel de Dios <miguel.dedios@artica.es>
* operation/gis_maps/render_view.php: fixed the mysql error
messages when have a "none" for group in a layer.
MERGED FROM THE BRANCH PANDORA_4
2013-02-28 Miguel de Dios <miguel.dedios@artica.es>
* godmode/modules/manage_network_components_form.php,

10
pandora_console/operation/gis_maps/render_view.php
View File

@ -144,8 +144,12 @@ if ($layers != false) {
gis_make_layer($layer['layer_name'], $layer['view_layer'], null, $layer['id_tmap_layer']);
// calling agents_get_group_agents with none to obtain the names in the same case as they are in the DB.
$agentNamesByGroup = agents_get_group_agents($layer['tgrupo_id_grupo'],false,'none', true, true, false);
$agentNamesByLayer = gis_get_agents_layer($layer['id_tmap_layer'], array('nombre'));
if ($layer['tgrupo_id_grupo'] >= 0) {
$agentNamesByGroup = agents_get_group_agents($layer['tgrupo_id_grupo'],
false, 'none', true, true, false);
}
$agentNamesByLayer = gis_get_agents_layer($layer['id_tmap_layer'],
array('nombre'));
$agentNames = array_unique($agentNamesByGroup + $agentNamesByLayer);
@ -163,6 +167,8 @@ if ($layers != false) {
gis_add_path($layer['layer_name'], $idAgent, $lastPosition);
}
}
$icon = gis_get_agent_icon_map($idAgent, true);
$status = agents_get_status($idAgent);
$parent = db_get_value('id_parent', 'tagente', 'id_agente', $idAgent);