From 1c0c23f5f0dcdd2b40b2c17f78f5fd4a9873b8eb Mon Sep 17 00:00:00 2001
From: zarzuelo <zarzuelo@gmail.com>
Date: Tue, 11 May 2010 15:54:49 +0000
Subject: [PATCH] 2010-05-11 Sergio Martin <sergio.martin@artica.es>
* godmode/setup/gis_step_2.php: Fixed the creation
of connection map in GIS maps for bug 3000031
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2695 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
pandora_console/ChangeLog | 5 +++++
pandora_console/godmode/setup/gis_step_2.php | 7 +++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 247d3f3d96..92938d0f2c 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-11 Sergio Martin <sergio.martin@artica.es>
+
+ * godmode/setup/gis_step_2.php: Fixed the creation
+ of connection map in GIS maps for bug 3000031
+
2010-05-11 Raúl Mateos <raulofpandora@gmail.com>
* godmode/reporting/map_builder.php: Fixed a typo.
diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php
index 0753091c3f..11e5ce7be4 100755
--- a/pandora_console/godmode/setup/gis_step_2.php
+++ b/pandora_console/godmode/setup/gis_step_2.php
@@ -126,7 +126,7 @@ switch ($action) {
}
//TODO VALIDATE PARAMETERS
- if ($mapConnection_name != "" && $mapConnection_type != 0) {
+ if ($mapConnection_name != "" && $mapConnection_type != ""){
saveMapConnection($mapConnection_name, $mapConnection_group,
$mapConnection_numLevelsZoom, $mapConnection_defaultZoom,
$mapConnection_defaultLatitude, $mapConnection_defaultLongitude,
@@ -134,11 +134,10 @@ switch ($action) {
$mapConnection_centerLongitude, $mapConnection_centerAltitude,
$mapConnectionData, $idConnectionMap);
}
-
+
require_once('gis.php');
return;
- break;
-}
+ }
$table->width = '90%';