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> 

* 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
This commit is contained in:
zarzuelo 2010-04-29 08:25:20 +00:00
parent d40500cad3
commit eeca5bb44c
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2010-04-29 Sergio Martin <sergio.martin@artica.es>
* 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 <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php,

2
pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql
View File

@ -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`

4
pandora_console/godmode/gis_maps/configure_gis_map.php
View File

@ -328,7 +328,7 @@ $table->data[1][1] = "<table class='databox' border='0' id='map_connection'>
</table>";
$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] = '<div id="form_layer">
</tr>
<tr>
<td>' . __('Show agents from group') . ':</td>
<td colspan="3">' . print_select_from_sql('SELECT id_grupo, nombre FROM tgrupo', 'layer_group_form', '', '', __('None'), '0', true) . '</td>
<td colspan="3">' . 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) . '</td>
</tr>
<tr>
<td colspan="4"><hr /></td>

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

@ -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);

2
pandora_console/pandoradb.sql
View File

@ -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`