diff options
Diffstat (limited to 'plugins')
7 files changed, 3 insertions, 22 deletions
diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject d07f280155988915acb52fd03f2cd1b0639a2e7 +Subproject e59fd118a975459ecc28cf94c41fa9017fb6dce diff --git a/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php b/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php index 9b0429c7c9..546236e9a6 100644 --- a/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php +++ b/plugins/UserCountry/tests/System/AttributeHistoricalDataWithLocationsTest.php @@ -101,7 +101,8 @@ class AttributeHistoricalDataWithLocationsTest extends IntegrationTestCase $queryParams = array( 'idSite' => self::$fixture->idSite, 'date' => self::$fixture->dateTime, - 'period' => 'month' + 'period' => 'month', + 'hideColumns' => 'sum_visit_length' // for unknown reasons this field is different in MySQLI only for this system test ); // we need to manually reload the translations since they get reset for some reason in IntegrationTestCase::tearDown(); diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml index 1a9caf8a5a..af2eb4e1ed 100644 --- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml +++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCity_month.xml @@ -5,7 +5,6 @@ <nb_visits>22</nb_visits> <nb_actions>61</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>17831</sum_visit_length> <bounce_count>11</bounce_count> <goals> <row idgoal='1'> @@ -36,7 +35,6 @@ <nb_visits>6</nb_visits> <nb_actions>16</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> @@ -69,7 +67,6 @@ <nb_visits>3</nb_visits> <nb_actions>7</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>1621</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> @@ -102,7 +99,6 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -135,7 +131,6 @@ <nb_visits>2</nb_visits> <nb_actions>6</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getContinent_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getContinent_month.xml index d410c25319..d1a6dc816d 100644 --- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getContinent_month.xml +++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getContinent_month.xml @@ -5,7 +5,6 @@ <nb_visits>22</nb_visits> <nb_actions>60</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>17831</sum_visit_length> <bounce_count>11</bounce_count> <goals> <row idgoal='1'> @@ -30,7 +29,6 @@ <nb_visits>8</nb_visits> <nb_actions>22</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>6484</sum_visit_length> <bounce_count>4</bounce_count> <goals> <row idgoal='1'> @@ -55,7 +53,6 @@ <nb_visits>5</nb_visits> <nb_actions>13</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>3242</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml index faa38d2190..66bfe2fbc3 100644 --- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml +++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getCountry_month.xml @@ -5,7 +5,6 @@ <nb_visits>18</nb_visits> <nb_actions>50</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>14589</sum_visit_length> <bounce_count>9</bounce_count> <goals> <row idgoal='1'> @@ -34,7 +33,6 @@ <nb_visits>6</nb_visits> <nb_actions>16</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> @@ -63,7 +61,6 @@ <nb_visits>3</nb_visits> <nb_actions>7</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>1621</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> @@ -92,7 +89,6 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -121,7 +117,6 @@ <nb_visits>2</nb_visits> <nb_actions>6</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -150,7 +145,6 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -179,7 +173,6 @@ <nb_visits>2</nb_visits> <nb_actions>6</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml index 107dc47a28..26b27b21a9 100644 --- a/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml +++ b/plugins/UserCountry/tests/System/expected/test_AttributeHistoricalDataWithLocationsTest_testExecute_ShouldReturnLogAfterWorkingWithSomeData__UserCountry.getRegion_month.xml @@ -5,7 +5,6 @@ <nb_visits>22</nb_visits> <nb_actions>61</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>17831</sum_visit_length> <bounce_count>11</bounce_count> <goals> <row idgoal='1'> @@ -34,7 +33,6 @@ <nb_visits>6</nb_visits> <nb_actions>16</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>4863</sum_visit_length> <bounce_count>3</bounce_count> <goals> <row idgoal='1'> @@ -64,7 +62,6 @@ <nb_visits>3</nb_visits> <nb_actions>7</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>1621</sum_visit_length> <bounce_count>2</bounce_count> <goals> <row idgoal='1'> @@ -94,7 +91,6 @@ <nb_visits>2</nb_visits> <nb_actions>6</nb_actions> <max_actions>5</max_actions> - <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> @@ -124,7 +120,6 @@ <nb_visits>2</nb_visits> <nb_actions>5</nb_actions> <max_actions>4</max_actions> - <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <goals> <row idgoal='1'> diff --git a/plugins/VisitsSummary/Reports/Get.php b/plugins/VisitsSummary/Reports/Get.php index ba6d2e94ba..967d566fee 100644 --- a/plugins/VisitsSummary/Reports/Get.php +++ b/plugins/VisitsSummary/Reports/Get.php @@ -111,7 +111,7 @@ class Get extends \Piwik\Plugin\Report $firstRow->setColumn('avg_time_generation', $avgGenerationTime); } - $numberMetrics = array('nb_visits', 'nb_uniq_visitors', 'nb_uniq_visitors', 'nb_users', 'nb_actions', + $numberMetrics = array('nb_visits', 'nb_uniq_visitors', 'nb_users', 'nb_actions', 'nb_pageviews', 'nb_uniq_pageviews', 'nb_searches', 'nb_keywords', 'nb_downloads', 'nb_uniq_downloads', 'nb_outlinks', 'nb_uniq_outlinks', 'max_actions'); foreach ($numberMetrics as $metric) { |