Fixing lots of system tests.

1 files changed, 9 insertions, 1 deletions

diff --git a/plugins/Actions/Columns/Metrics/AveragePageGenerationTime.php b/plugins/Actions/Columns/Metrics/AveragePageGenerationTime.php
index fb01b964e3..9b44e88943 100644
--- a/plugins/Actions/Columns/Metrics/AveragePageGenerationTime.php
+++ b/plugins/Actions/Columns/Metrics/AveragePageGenerationTime.php
@@ -68,7 +68,10 @@ class AveragePageGenerationTime extends ProcessedMetric
     {
         $hasTimeGeneration = array_sum($this->getMetricValues($table, 'sum_time_generation')) > 0;
 
-        if (!$hasTimeGeneration) {
+        if (!$hasTimeGeneration
+            && $table->getRowsCount() != 0
+            && !$this->hasAverageTimeGeneration($table)
+        ) {
             // No generation time: remove it from the API output and add it to empty_columns metadata, so that
             // the columns can also be removed from the view
             $table->filter('ColumnDelete', array(array(
@@ -97,4 +100,9 @@ class AveragePageGenerationTime extends ProcessedMetric
 
         return $hasTimeGeneration;
     }
+
+    private function hasAverageTimeGeneration(DataTable $table)
+    {
+        return $table->getFirstRow()->getColumn('avg_time_generation') !== false;
+    }
 }
\ No newline at end of file