From 24e7d86f724853db39a0bc0889b649972165efef Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Thu, 29 Apr 2010 08:25:20 +0000 Subject: [PATCH] 2010-04-29 Sergio Martin * pandoradb.sql extras/pandoradb_migrate_v3.0_to_v3.1.sql godmode/setup/gis_step_2.php godmode/gis_maps/configure_gis_map.php: Added at the combos the group All and asigned in creation layers -1 value to None value git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2633 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql | 2 +- pandora_console/godmode/gis_maps/configure_gis_map.php | 4 ++-- pandora_console/godmode/setup/gis_step_2.php | 2 +- pandora_console/pandoradb.sql | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1eaf1e230a..d733f187d4 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2010-04-29 Sergio Martin + + * pandoradb.sql + extras/pandoradb_migrate_v3.0_to_v3.1.sql + godmode/setup/gis_step_2.php + godmode/gis_maps/configure_gis_map.php: Added at the combos the + group All and asigned in creation layers -1 value to None value + 2010-04-29 Miguel de Dios * godmode/reporting/reporting_builder.php, 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 6bc26e688e..a8a64ff912 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 @@ -216,7 +216,7 @@ CREATE TABLE IF NOT EXISTS `tgis_map_layer` ( `view_layer` TINYINT(1) NOT NULL DEFAULT TRUE COMMENT 'True if the layer must be shown' , `layer_stack_order` TINYINT(3) NULL DEFAULT 0 COMMENT 'Number of order of the layer in the layer stack, bigger means upper on the stack.\n' , `tgis_map_id_tgis_map` INT NOT NULL COMMENT 'reference to the map containing the layer' , - `tgrupo_id_grupo` MEDIUMINT(4) UNSIGNED NOT NULL COMMENT 'reference to the group shown in the layer' , + `tgrupo_id_grupo` MEDIUMINT(4) NOT NULL COMMENT 'reference to the group shown in the layer' , PRIMARY KEY (`id_tmap_layer`) , INDEX `fk_tmap_layer_tgis_map1` (`tgis_map_id_tgis_map` ASC) , CONSTRAINT `fk_tmap_layer_tgis_map1` diff --git a/pandora_console/godmode/gis_maps/configure_gis_map.php b/pandora_console/godmode/gis_maps/configure_gis_map.php index 5fad9de4ee..b7393c3866 100644 --- a/pandora_console/godmode/gis_maps/configure_gis_map.php +++ b/pandora_console/godmode/gis_maps/configure_gis_map.php @@ -328,7 +328,7 @@ $table->data[1][1] = "
"; $table->data[2][0] = __('Group') . print_help_tip (__('Group that owns the map'), true). ':'; -$table->data[2][1] = print_select_from_sql('SELECT id_grupo, nombre FROM tgrupo', 'map_group_id', $map_group_id, '', '', '0', true); +$table->data[2][1] = print_select_from_sql('SELECT id_grupo, nombre FROM tgrupo', 'map_group_id', $map_group_id, '', __('All'), '0', true); $table->data[3][0] = __('Default zoom') . print_help_tip (__('Default zoom level when opening the map'), true). ':'; $table->data[3][1] = print_input_text ('map_zoom_level', $map_zoom_level, '', 2, 4, true) . print_input_hidden('map_levels_zoom', $map_levels_zoom, true); @@ -376,7 +376,7 @@ $table->data[1][1] = '
' . __('Show agents from group') . ': - ' . print_select_from_sql('SELECT id_grupo, nombre FROM tgrupo', 'layer_group_form', '', '', __('None'), '0', true) . ' + ' . print_select_from_sql('SELECT 0 as id_grupo, "'.__('All').'" as nombre FROM tgrupo UNION SELECT id_grupo, nombre FROM tgrupo', 'layer_group_form', '-1', '', __('None'), '-1', true) . '
diff --git a/pandora_console/godmode/setup/gis_step_2.php b/pandora_console/godmode/setup/gis_step_2.php index 7e4a99e57b..0bdfc7c735 100755 --- a/pandora_console/godmode/setup/gis_step_2.php +++ b/pandora_console/godmode/setup/gis_step_2.php @@ -146,7 +146,7 @@ $table->data[0][0] = __('Connection Name') .print_help_tip (__('Descriptive name $table->data[0][1] = print_input_text ('name', $mapConnection_name, '', 30, 60, true); $table->data[1][0] = __("Group") .print_help_tip (__('Group that owns the connection'), true) . ":"; -$table->data[1][1] = print_select_from_sql('SELECT id_grupo, nombre FROM tgrupo', 'group', $mapConnection_group, '', '', '0', true); +$table->data[1][1] = print_select_from_sql('SELECT id_grupo, nombre FROM tgrupo', 'group', $mapConnection_group, '', __('All'), '0', true); $table->data[2][0] = __('Number of zoom levels') . ":"; $table->data[2][1] = print_input_text ('num_levels_zoom', $mapConnection_numLevelsZoom, '', 4, 10, true); diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index addfca5f1f..8c3e48f9de 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -1029,7 +1029,7 @@ CREATE TABLE IF NOT EXISTS `tgis_map_layer` ( `view_layer` TINYINT(1) NOT NULL DEFAULT TRUE COMMENT 'True if the layer must be shown' , `layer_stack_order` TINYINT(3) NULL DEFAULT 0 COMMENT 'Number of order of the layer in the layer stack, bigger means upper on the stack.\n' , `tgis_map_id_tgis_map` INT NOT NULL COMMENT 'reference to the map containing the layer' , - `tgrupo_id_grupo` MEDIUMINT(4) UNSIGNED NOT NULL COMMENT 'reference to the group shown in the layer' , + `tgrupo_id_grupo` MEDIUMINT(4) NOT NULL COMMENT 'reference to the group shown in the layer' , PRIMARY KEY (`id_tmap_layer`) , INDEX `fk_tmap_layer_tgis_map1` (`tgis_map_id_tgis_map` ASC) , CONSTRAINT `fk_tmap_layer_tgis_map1`