Change force_format_processed_metrics query param to format_metrics in remaining places.

diosmosis · diosmosis · commit a035f162e4b0 · 2014-11-16T15:52:04.000-08:00
diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
@@ -173,7 +173,7 @@ protected function callApiAndReturnDataTable($apiModule, $method, $request)
         $request['serialize'] = 0;
         $request['expanded'] = 0;
         $request['format'] = 'original';
-        $request['force_format_processed_metrics'] = 0;
+        $request['format_metrics'] = 0;
 
         // don't want to run recursive filters on the subtables as they are loaded,
         // otherwise the result will be empty in places (or everywhere). instead we
diff --git a/core/API/DataTablePostProcessor.php b/core/API/DataTablePostProcessor.php
@@ -80,7 +80,9 @@ public function __construct($apiModule, $apiMethod, $request)
      */
     public function process(DataTableInterface $dataTable)
     {
-        // TODO: when calculating metrics before hand, only calculate for needed metrics, not all.
+        // TODO: when calculating metrics before hand, only calculate for needed metrics, not all. NOTE:
+        //       this is non-trivial since it will require, eg, to make sure processed metrics aren't added
+        //       after pivotBy is handled.
         $dataTable = $this->applyPivotByFilter($dataTable);
         $dataTable = $this->applyFlattener($dataTable);
         $dataTable = $this->applyTotalsCalculator($dataTable);
diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php
@@ -72,7 +72,7 @@ public function renderSidebar()
             . '&period=' . urlencode($period)
             . '&label=' . urlencode($label)
             . '&format=original'
-            . '&force_format_processed_metrics=1'
+            . '&format_metrics=1'
         );
         $dataTable = $request->process();
 
