From d66340b9df5c98c8feb1f6bda72d81c2b088aa6d Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 13 May 2010 15:36:47 +0000 Subject: [PATCH] 2010-05-13 Sergio Martin * godmode/gis_maps/configure_gis_map.php: Fixed the Gis map without map connection. Now is impossible to create or update a GIS map without map connection Bug: 3000014 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2721 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/godmode/gis_maps/configure_gis_map.php | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e96a032327..da656cd442 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2010-05-13 Sergio Martin + + * godmode/gis_maps/configure_gis_map.php: Fixed the + Gis map without map connection. Now is impossible + to create or update a GIS map without map connection + Bug: 3000014 + 2010-05-13 Miguel de Dios * include/gettext.php: fixed the bug of pseudo-gettext with diferent diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php index 65bd3f231c..33a7542a01 100644 --- a/pandora_console/godmode/gis_maps/configure_gis_map.php +++ b/pandora_console/godmode/gis_maps/configure_gis_map.php @@ -101,8 +101,10 @@ switch ($action) { $map_default_altitude = get_parameter('map_default_altitude'); $map_group_id = get_parameter('map_group_id'); $map_levels_zoom = get_parameter('map_levels_zoom'); - + $map_connection_list_temp = explode(",",get_parameter('map_connection_list')); + + foreach ($map_connection_list_temp as $index => $value) { $cleanValue = trim($value); if ($cleanValue == '') { @@ -144,7 +146,7 @@ switch ($action) { $map_default_longitude, $map_default_latitude, $map_default_altitude, $map_connection_list, $map_levels_zoom); - if (empty($invalidFields)) { + if (empty($invalidFields) && get_parameter('map_connection_list') != "") { saveMap($map_name, $map_initial_longitude, $map_initial_latitude, $map_initial_altitude, $map_zoom_level, $map_background, $map_default_longitude, $map_default_latitude, $map_default_altitude, @@ -266,7 +268,7 @@ switch ($action) { $map_default_longitude, $map_default_latitude, $map_default_altitude, $map_connection_list, $map_levels_zoom); - if (empty($invalidFields)) { + if (empty($invalidFields) && get_parameter('map_connection_list') != "") { //TODO updateMap($idMap, $map_name, $map_initial_longitude, $map_initial_latitude, $map_initial_altitude, $map_zoom_level, $map_background,