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

2010-04-29 Sergio Martin <sergio.martin@artica.es> 

* godmode/setup/gis_step_2.php: Fixed the creation 
	of map connection without name and without type
	of connection. Bug:2993713



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2638 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2010-04-29 14:32:22 +00:00
parent ce7d7274c6
commit d4aac2b504
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2010-04-29 Sergio Martin <sergio.martin@artica.es>
* godmode/setup/gis_step_2.php: Fixed the creation
of map connection without name and without type
of connection. Bug:2993713
2010-04-29 Sergio Martin <sergio.martin@artica.es>
* godmode/servers/manage_recontask.php: Fixed the creation

18
pandora_console/godmode/setup/gis_step_2.php
View File

@ -126,13 +126,14 @@ switch ($action) {
}
//TODO VALIDATE PARAMETERS
saveMapConnection($mapConnection_name, $mapConnection_group,
$mapConnection_numLevelsZoom, $mapConnection_defaultZoom,
$mapConnection_defaultLatitude, $mapConnection_defaultLongitude,
$mapConnection_defaultAltitude, $mapConnection_centerLatitude,
$mapConnection_centerLongitude, $mapConnection_centerAltitude,
$mapConnectionData, $idConnectionMap);
if ($mapConnection_name != "" && $mapConnection_type != 0) {
saveMapConnection($mapConnection_name, $mapConnection_group,
$mapConnection_numLevelsZoom, $mapConnection_defaultZoom,
$mapConnection_defaultLatitude, $mapConnection_defaultLongitude,
$mapConnection_defaultAltitude, $mapConnection_centerLatitude,
$mapConnection_centerLongitude, $mapConnection_centerAltitude,
$mapConnectionData, $idConnectionMap);
}
require_once('gis.php');
return;
@ -160,12 +161,11 @@ print_table($table);
$table->width = '60%';
$table->data = array();
$types[0] = __('Please select the connection type');
$types["OSM"] = __('Open Street Maps');
$types["Gmap"] = __('Google Maps');
$types["Static_Image"] = __('Static Image');
$table->data[0][0] = __('Type') . ":";
$table->data[0][1] = print_select($types, 'sel_type', $mapConnection_type, "selMapConnectionType();", '', 0, true);
$table->data[0][1] = print_select($types, 'sel_type', $mapConnection_type, "selMapConnectionType();", __('Please select the connection type'), 0, true);
echo "<h3>" . __('Map connection type') . "</h3>";
print_table ($table);