Saved map bugfixes

* Fixed handling of location types when saving maps * Extended width of x2_maps.locationType field
prem-hunt · Nov 15, 2016 · 827a808 · 827a808
1 parent 6bf3087
commit 827a808
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/x2engine/protected/data/core.sql b/x2engine/protected/data/core.sql
@@ -602,7 +602,7 @@ CREATE TABLE x2_maps(
     centerLat           FLOAT,
     centerLng           FLOAT,
     zoom                INT,
-	locationType        VARCHAR(50)
+	locationType        VARCHAR(250)
 ) COLLATE = utf8_general_ci;
 /*&*/
 DROP TABLE IF EXISTS x2_tips;

diff --git a/x2engine/protected/models/Locations.php b/x2engine/protected/models/Locations.php
@@ -175,6 +175,18 @@ public function relations() {
         );
     }
 
+    public static function renderLocationTypes($types) {
+        if (!is_array($types)) $types = array($types);
+        $availableTypes = self::getLocationTypes();
+        foreach ($types as $i => $type) {
+            if ($type)
+                $types[$i] = $availableTypes[$type];
+            else
+                $types[$i] = $availableTypes['address'];
+        }
+        return implode(', ', $types);
+    }
+
     /**
      * Perform a GeoIP lookup of the specified IP. Dual layered caching is used here, first
      * checking the cache, before consulting the db, resorting to a GeoIP lookup if missing

diff --git a/x2engine/protected/modules/contacts/controllers/ContactsController.php b/x2engine/protected/modules/contacts/controllers/ContactsController.php
@@ -411,6 +411,8 @@ public function actionGoogleMaps($contactId = null, $params = array(), $loadMap
             if(isset($map)){
                 $contactId = $map->contactId;
                 $params = json_decode($map->params, true);
+                if (isset($params['tags']) && is_array($params['tags']))
+                    $params['tags'] = implode(',', $params['tags']);
             }
         }
         $conditions = "TRUE";
@@ -594,8 +596,8 @@ public function actionGoogleMaps($contactId = null, $params = array(), $loadMap
             'leadSource' => 
                 isset($_POST['params']['leadSource']) ? 
                     $_POST['params']['leadSource'] : '',
-            'tags' => ((isset($_POST['params']['tags']) && !empty($_POST['params']['tags'])) ? 
-                Tags::parseTags($_POST['params']['tags']) : array()),
+            'tags' => ((isset($params['tags']) && !empty($params['tags'])) ? 
+                Tags::parseTags($params['tags']) : array()),
             'zoom' => isset($zoom) ? $zoom : null,
             'mapFlag' => isset($map) ? 'true' : 'false',
             'noHeatMap' => $noHeatMap,
@@ -623,7 +625,7 @@ public function actionSaveMap(){
             $map->name = $mapName;
             $map->owner = Yii::app()->user->getName();
             $map->contactId = $contactId;
-            $map->locationType = $locationType;
+            $map->locationType = Locations::renderLocationTypes($locationType);
             $map->zoom = $zoom;
             $map->centerLat = $centerLat;
             $map->centerLng = $centerLng;

diff --git a/x2engine/protected/modules/contacts/views/contacts/savedMaps.php b/x2engine/protected/modules/contacts/views/contacts/savedMaps.php
@@ -81,7 +81,7 @@
         array(
             'header'=>Yii::t('contacts','Location Type'),
             'type'=>'raw',
-            'value'=>'!is_null($data->locationType) ? Locations::getLocationTypes()[$data->locationType] : Yii::t("contacts", "All")'
+            'value'=>'!is_null($data->locationType) ? $data->locationType : Yii::t("contacts", "All")'
         ),
         array(
             'header'=>Yii::t('contacts','Delete Map'),