From a1c1c172f2e27882471caba656218d367d894a80 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Mon, 1 Mar 2010 11:40:07 +0000
Subject: [PATCH] 2010-03-01 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: in fuction "getAgentsLayer" fix when none data
for agents in this layer.
* operation/gis_maps/render_view.php: fix link to edit map and fix the text
of header.
operation/gis_maps/index.php: use function "print_page_header".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 10 ++++++++++
pandora_console/include/functions_gis.php | 9 +++++++--
pandora_console/operation/gis_maps/index.php | 2 +-
pandora_console/operation/gis_maps/render_view.php | 4 ++--
4 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index a1d7397fa2..d539247553 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-01 Miguel de Dios <miguel.dedios@artica.es>
+
+ * include/functions_gis.php: in fuction "getAgentsLayer" fix when none data
+ for agents in this layer.
+
+ * operation/gis_maps/render_view.php: fix link to edit map and fix the text
+ of header.
+
+ operation/gis_maps/index.php: use function "print_page_header".
+
2010-03-01 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_gis.php: now function "getAgentMap" return true or false
diff --git a/pandora_console/include/functions_gis.php b/pandora_console/include/functions_gis.php
index 526fd1480b..e1ccfc2692 100644
--- a/pandora_console/include/functions_gis.php
+++ b/pandora_console/include/functions_gis.php
@@ -374,8 +374,13 @@ function getAgentsLayer($idLayer, $fields = null) {
$agents = get_db_all_rows_sql('SELECT ' . $select . ' FROM tagente WHERE id_agente IN (
SELECT tagente_id_agente FROM tgis_map_layer_has_tagente WHERE tgis_map_layer_id_tmap_layer = ' . $idLayer . ');');
- foreach ($agents as $index => $agent) {
- $agents[$index] = $agent['nombre'];
+ if ($agents !== false) {
+ foreach ($agents as $index => $agent) {
+ $agents[$index] = $agent['nombre'];
+ }
+ }
+ else {
+ return array();
}
diff --git a/pandora_console/operation/gis_maps/index.php b/pandora_console/operation/gis_maps/index.php
index 6b4c1bd9c7..10d0f826b4 100644
--- a/pandora_console/operation/gis_maps/index.php
+++ b/pandora_console/operation/gis_maps/index.php
@@ -23,7 +23,7 @@ require_once ('include/functions_gis.php');
require_javascript_file('openlayers.pandora');
-echo "<h2>".__('GIS Maps')." » ".__('Summary')."</h2>";
+print_page_header(__('GIS Maps')." » ".__('Summary'), "images/server_web.png", false, "gis_map_summary");
$maps = getMaps();
diff --git a/pandora_console/operation/gis_maps/render_view.php b/pandora_console/operation/gis_maps/render_view.php
index 6670a466de..8f477fe7c8 100644
--- a/pandora_console/operation/gis_maps/render_view.php
+++ b/pandora_console/operation/gis_maps/render_view.php
@@ -76,7 +76,7 @@ else {
}
if (give_acl ($config["id_user"], $map['group_id'], "AW"))
- $buttons [] = '<a href="index.php?sec=gismaps&sec2=operation/gis_maps/render_view&map_id='. $idMap.'">'.print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
+ $buttons [] = '<a href="index.php?sec=godgismaps&sec2=godmode/gis_maps/configure_gis_map&action=edit_map&map_id='. $idMap.'">'.print_image ("images/setup.png", true, array ("title" => __('Setup'))).'</a>';
$buttonsString = '<a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=3"><img src="images/bricks.png" class="top" border="0"> Agent - test_gis1</a></li></ul></div><div id="menu_tab"><ul class="mn"><li class="nomn"><a href="index.php?sec=gagente&sec2=godmode/agentes/configurar_agente&id_agente=3"><img src="images/setup.png" class="top" title="Manage" border="0" width="16"> </a></li><li class="nomn_high"><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=3"><img src="images/monitor.png" class="top" title="Main" border="0"> </a></li><li class="nomn"><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=3&tab=data"><img src="images/lightbulb.png" class="top" title="Data" border="0"> </a></li><li class="nomn"><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&id_agente=3&tab=alert"><img src="images/bell.png" class="top" title="Alerts" border="0"> </a></li><li class="nomn"><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=sla&id_agente=3"><img src="images/images.png" class="top" title="S.L.A." border="0"> </a></li><li class="nomn"><a href="index.php?sec=estado&sec2=operation/agentes/estado_agente&group_id=2"><img src="images/agents_group.png" class="top" title="Group" border="0"> </a></li><li class="nomn"><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=inventory&id_agente=3"><img src="images/page_white_text.png" class="top" title="Inventory" border="0" width="16"> </a></li><li class="nomn"><a href="index.php?sec=estado&sec2=operation/agentes/ver_agente&tab=gis&id_agente=3"><img src="images/world.png" class="top" title="GIS data" border="0"> </a>';
@@ -102,7 +102,7 @@ $buttons[] = '<a id="button_status_default" href="javascript: changeShowStatus(\
$buttons[] = __('Show agents in state: ');
-print_page_header(__('Visual console') . " » " . __('Map') . " " . $map['map_name'], "", false, "", false, $buttons);
+print_page_header(__('Map') . " » " . __('Map') . " " . $map['map_name'], "", false, "", false, $buttons);
printMap('map', $map['zoom_level'], $numZoomLevels, $map['initial_latitude'],
$map['initial_longitude'], $baselayers, $controls);