#6933 Improve the "Device model" report by prefixing the model with the brand name

E.g. 'iPad' would become 'Apple - iPad'

plugins/DevicesDetection/Archiver.php

@@ -25,7 +25,7 @@ class Archiver extends \Piwik\Plugin\Archiver
 
     const DEVICE_TYPE_FIELD = "config_device_type";
     const DEVICE_BRAND_FIELD = "config_device_brand";
-    const DEVICE_MODEL_FIELD = "config_device_model";
+    const DEVICE_MODEL_FIELD = "CONCAT(log_visit.config_device_brand, ';', log_visit.config_device_model)";
     const OS_FIELD = "config_os";
     const OS_VERSION_FIELD = "CONCAT(log_visit.config_os, ';', COALESCE(log_visit.config_os_version, ''))";
     const BROWSER_FIELD = "config_browser_name";

plugins/DevicesDetection/Columns/DeviceModel.php

@@ -34,9 +34,6 @@ class DeviceModel extends Base
         $userAgent = $request->getUserAgent();
         $parser    = $this->getUAParser($userAgent);
 
-        $brand = $parser->getBrandName();
-        $brand = $brand ? $brand . ' - ' : '';
-
-        return $brand . $parser->getModel();
+        return $parser->getModel();
     }
 }

plugins/DevicesDetection/functions.php

@@ -179,10 +179,19 @@ function getDeviceTypeLogo($label)
 
 function getModelName($label)
 {
-    if (!$label) {
-        return Piwik::translate('General_Unknown');
+    if (strpos($label, ';') !== false) {
+        list($brand, $model) = explode(';', $label, 2);
+    } else {
+        $brand = null;
+        $model = $label;
+    }
+    if (!$model) {
+        $model = Piwik::translate('General_Unknown');
+    }
+    if (!$brand) {
+        return $model;
     }
-    return $label;
+    return getDeviceBrandLabel($brand) . ' - ' . $model;
 }
 
 function getOSFamilyFullName($label)