From b036be6534419ae05ff11ce23239977de1cf0b96 Mon Sep 17 00:00:00 2001 From: rWatcher Date: Tue, 26 Apr 2011 19:24:01 -0400 Subject: [PATCH] Bugfix: Properly record map type on admin screen. --- 3.0/modules/tagsmap/controllers/admin_tagsmap.php | 8 ++++++-- 3.1/modules/tagsmap/controllers/admin_tagsmap.php | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/3.0/modules/tagsmap/controllers/admin_tagsmap.php b/3.0/modules/tagsmap/controllers/admin_tagsmap.php index 8c9b643a..40d87119 100644 --- a/3.0/modules/tagsmap/controllers/admin_tagsmap.php +++ b/3.0/modules/tagsmap/controllers/admin_tagsmap.php @@ -206,8 +206,12 @@ class Admin_TagsMap_Controller extends Admin_Controller { $startingmap_group->dropdown("google_default_type") ->label(t("Default Map Type")) ->options( - array("G_NORMAL_MAP", "G_SATELLITE_MAP", "G_HYBRID_MAP", - "G_PHYSICAL_MAP", "G_SATELLITE_3D_MAP")); + array("G_NORMAL_MAP" => "Normal", + "G_SATELLITE_MAP" => "Satellite", + "G_HYBRID_MAP" => "Hybrid", + "G_PHYSICAL_MAP" => "Physical", + "G_SATELLITE_3D_MAP" => "Google Earth")) + ->selected(module::get_var("tagsmap", "googlemap_type")); // Add a save button to the form. $form->submit("SaveSettings")->value(t("Save")); diff --git a/3.1/modules/tagsmap/controllers/admin_tagsmap.php b/3.1/modules/tagsmap/controllers/admin_tagsmap.php index 8c9b643a..40d87119 100644 --- a/3.1/modules/tagsmap/controllers/admin_tagsmap.php +++ b/3.1/modules/tagsmap/controllers/admin_tagsmap.php @@ -206,8 +206,12 @@ class Admin_TagsMap_Controller extends Admin_Controller { $startingmap_group->dropdown("google_default_type") ->label(t("Default Map Type")) ->options( - array("G_NORMAL_MAP", "G_SATELLITE_MAP", "G_HYBRID_MAP", - "G_PHYSICAL_MAP", "G_SATELLITE_3D_MAP")); + array("G_NORMAL_MAP" => "Normal", + "G_SATELLITE_MAP" => "Satellite", + "G_HYBRID_MAP" => "Hybrid", + "G_PHYSICAL_MAP" => "Physical", + "G_SATELLITE_3D_MAP" => "Google Earth")) + ->selected(module::get_var("tagsmap", "googlemap_type")); // Add a save button to the form. $form->submit("SaveSettings")->value(t("Save"));