From ba0219e924790419a5717b073d354b02d16b1500 Mon Sep 17 00:00:00 2001
From: benakamoorthi <benaka.moorthi@gmail.com>
Date: Thu, 11 Oct 2012 21:10:20 +0000
Subject: [PATCH] Remove shortLabel metadata from UserSettings.getBrowser.
git-svn-id: http://dev.piwik.org/svn/trunk@7157 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
plugins/UserSettings/API.php | 5 +++--
.../test_ImportLogs__UserSettings.getBrowser_month.xml | 5 -----
...test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml | 1 -
...Visits_withCookieSupport__UserSettings.getBrowser_day.xml | 1 -
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
index 19e5e5955c..ced9462bec 100644
--- a/plugins/UserSettings/API.php
+++ b/plugins/UserSettings/API.php
@@ -115,7 +115,6 @@ class Piwik_UserSettings_API
public function getBrowserVersion( $idSite, $period, $date, $segment = false )
{
$dataTable = $this->getDataTable('UserSettings_browser', $idSite, $period, $date, $segment);
- // these filters are applied directly so getBrowser can use GroupBy on the result of this method
$dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getBrowsersLogo'));
$dataTable->filter('ColumnCallbackAddMetadata', array('label', 'shortLabel', 'Piwik_getBrowserShortLabel'));
$dataTable->filter('ColumnCallbackReplace', array('label', 'Piwik_getBrowserLabel'));
@@ -128,7 +127,9 @@ class Piwik_UserSettings_API
*/
public function getBrowser( $idSite, $period, $date, $segment = false )
{
- $dataTable = $this->getBrowserVersion($idSite, $period, $date, $segment);
+ $dataTable = $this->getDataTable('UserSettings_browser', $idSite, $period, $date, $segment);
+ $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getBrowsersLogo'));
+ $dataTable->filter('ColumnCallbackReplace', array('label', 'Piwik_getBrowserLabel'));
$getBrowserFromBrowserVersion = 'Piwik_UserSettings_getBrowserFromBrowserVersion';
$dataTable->filter('GroupBy', array('label', $getBrowserFromBrowserVersion));
diff --git a/tests/integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
index 7c7d9cd24f..ea27472629 100755
--- a/tests/integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
+++ b/tests/integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml
@@ -10,7 +10,6 @@
<nb_visits_converted>5</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/browsers/EP.gif</logo>
- <shortLabel>Epiphany 2.30</shortLabel>
</row>
<row>
<label>Chrome</label>
@@ -22,7 +21,6 @@
<nb_visits_converted>7</nb_visits_converted>
<sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/browsers/CH.gif</logo>
- <shortLabel>Chrome 11.0</shortLabel>
</row>
<row>
<label>Internet Explorer</label>
@@ -34,7 +32,6 @@
<nb_visits_converted>5</nb_visits_converted>
<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/browsers/IE.gif</logo>
- <shortLabel>IE 10.6</shortLabel>
</row>
<row>
<label>Firefox</label>
@@ -46,7 +43,6 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
- <shortLabel>Firefox 6.0</shortLabel>
</row>
<row>
<label>Safari</label>
@@ -58,6 +54,5 @@
<nb_visits_converted>2</nb_visits_converted>
<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
<logo>plugins/UserSettings/images/browsers/SF.gif</logo>
- <shortLabel>Safari 4.0</shortLabel>
</row>
</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
index 9f1b4296f0..84860eba92 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits__UserSettings.getBrowser_day.xml
@@ -10,6 +10,5 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
- <shortLabel>Firefox 3.6</shortLabel>
</row>
</result>
\ No newline at end of file
diff --git a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
index 9f1b4296f0..84860eba92 100644
--- a/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
+++ b/tests/integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserSettings.getBrowser_day.xml
@@ -10,6 +10,5 @@
<bounce_count>1</bounce_count>
<nb_visits_converted>2</nb_visits_converted>
<logo>plugins/UserSettings/images/browsers/FF.gif</logo>
- <shortLabel>Firefox 3.6</shortLabel>
</row>
</result>
\ No newline at end of file
--
GitLab