Refs #4041, #4077, make sure treemap subtable loading determines row limit dynamically, and allow visualizations to apply viewdatatable queued filters on their own time.

1 files changed, 5 insertions, 4 deletions

diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php
index f047905dc0..0d80148aae 100644
--- a/core/ViewDataTable.php
+++ b/core/ViewDataTable.php
@@ -610,14 +610,15 @@ class ViewDataTable
             $genericFilter->filter($this->dataTable);
         }
 
+        // queue other filters so they can be applied later if queued filters are disabled
+        foreach ($otherFilters as $filter) {
+            $this->dataTable->queueFilter($filter[0], $filter[1]);
+        }
+
         // Finally, apply datatable filters that were queued (should be 'presentation' filters that
         // do not affect the number of rows)
         if (!$this->areQueuedFiltersDisabled()) {
             $this->dataTable->applyQueuedFilters();
-
-            foreach ($otherFilters as $filter) {
-                $this->dataTable->filter($filter[0], $filter[1]);
-            }
         }
 
         return true;