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

2010-02-10 Pablo de la Concepción <pablo.concepcion@artica.es> 

* 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
This commit is contained in:
pabloconcepcion 2010-02-10 17:31:26 +00:00
parent 5052fcec23
commit 5cb263a7b6
4 changed files with 13 additions and 3 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-02-10 Pablo de la Concepción <pablo.concepcion@artica.es>
* 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 <slerena@artica.es>
* events.php: Fixed a bad link with an invalid id_agent.

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

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

6
pandora_console/godmode/gis_maps/index.php
View File

@ -78,11 +78,11 @@ if ($maps !== false) {
if ($map['default_map'])
$checked = true;
$table->data[] = array('<a href="index.php?sec=gismaps&sec2=operation/gis_maps/render_view&id='.$map['id_tgis_map'].'&amp;action=edit_map">' . $map['map_name'] . '</a>',
$table->data[] = array('<a href="index.php?sec=gismaps&sec2=operation/gis_maps/render_view&map_id='.$map['id_tgis_map'].'&amp;action=edit_map">' . $map['map_name'] . '</a>',
print_group_icon ($map['group_id'], true),
'<a href="index.php?sec=gismaps&sec2=operation/gis_maps/render_view&id='.$map['id_tgis_map'].'">' . print_image ("images/eye.png", true).'</a>',
'<a href="index.php?sec=gismaps&sec2=operation/gis_maps/render_view&map_id='.$map['id_tgis_map'].'">' . print_image ("images/eye.png", true).'</a>',
print_radio_button_extended('default_map', $map['id_tgis_map'], '', $checked, false, "setDefault(" . $map['id_tgis_map'] . ");", '', true),
'<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/index&amp;id_map='.$map['id_tgis_map'].'&amp;action=delete_map">' . print_image ("images/cross.png", true).'</a>');
'<a href="index.php?sec=godgismaps&amp;sec2=godmode/gis_maps/index&amp;map_id='.$map['id_tgis_map'].'&amp;action=delete_map">' . print_image ("images/cross.png", true).'</a>');
}
}

1
pandora_console/pandoradb.sql
View File

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