From 5cb263a7b668710adb79649e8b4ca92b14256252 Mon Sep 17 00:00:00 2001 From: pabloconcepcion Date: Wed, 10 Feb 2010 17:31:26 +0000 Subject: [PATCH] =?UTF-8?q?2010-02-10=20=20Pablo=20de=20la=20Concepci?= =?UTF-8?q?=C3=B3n=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * godmode/gis_maps/index.php: Fixed regresion, standarized using map_id as parameter. * pandoradb.sql, extras/pandoradb_migrate_v3.0_to_v3.1.sql: Added column default_map to table tgis_map to mark the default map git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2340 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql | 1 + pandora_console/godmode/gis_maps/index.php | 6 +++--- pandora_console/pandoradb.sql | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index e0277f7a0a..24d6600b04 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2010-02-10 Pablo de la Concepción + + * godmode/gis_maps/index.php: Fixed regresion, standarized using map_id + as parameter. + + * pandoradb.sql, extras/pandoradb_migrate_v3.0_to_v3.1.sql: Added column + default_map to table tgis_map to mark the default map + 2010-02-10 Sancho Lerena * events.php: Fixed a bad link with an invalid id_agent. diff --git a/pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql b/pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql index b5e27acf85..7ee99a4de1 100644 --- a/pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql +++ b/pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql @@ -84,6 +84,7 @@ CREATE TABLE IF NOT EXISTS `tgis_map` ( `default_latitude` DOUBLE NULL COMMENT 'default latitude for the agents placed on the map' , `default_altitude` DOUBLE NULL COMMENT 'default altitude for the agents placed on the map' , `group_id` INT(10) NOT NULL DEFAULT 0 COMMENT 'Group that owns the map' , + `default_map` TINYINT(1) NULL DEFAULT 0 COMMENT '1 if this is the default map, 0 in other case', PRIMARY KEY (`id_tgis_map`), INDEX `map_name_index` (`map_name` ASC) ) diff --git a/pandora_console/godmode/gis_maps/index.php b/pandora_console/godmode/gis_maps/index.php index 43f3da931a..41c30e194f 100644 --- a/pandora_console/godmode/gis_maps/index.php +++ b/pandora_console/godmode/gis_maps/index.php @@ -78,11 +78,11 @@ if ($maps !== false) { if ($map['default_map']) $checked = true; - $table->data[] = array('' . $map['map_name'] . '', + $table->data[] = array('' . $map['map_name'] . '', print_group_icon ($map['group_id'], true), - '' . print_image ("images/eye.png", true).'', + '' . print_image ("images/eye.png", true).'', print_radio_button_extended('default_map', $map['id_tgis_map'], '', $checked, false, "setDefault(" . $map['id_tgis_map'] . ");", '', true), - '' . print_image ("images/cross.png", true).''); + '' . print_image ("images/cross.png", true).''); } } diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index f01573da98..c39e244d4a 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -906,6 +906,7 @@ CREATE TABLE IF NOT EXISTS `tgis_map` ( `default_latitude` DOUBLE NULL COMMENT 'default latitude for the agents placed on the map' , `default_altitude` DOUBLE NULL COMMENT 'default altitude for the agents placed on the map' , `group_id` INT(10) NOT NULL DEFAULT 0 COMMENT 'Group that owns the map' , + `default_map` TINYINT(1) NULL DEFAULT 0 COMMENT '1 if this is the default map, 0 in other case', PRIMARY KEY (`id_tgis_map`), INDEX `map_name_index` (`map_name` ASC) )