diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2019-12-24 14:06:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-24 14:06:48 +0300 |
| commit | 2915d75f69f2340ee6dcf1a9f4401b658fb8c966 (patch) | |
| tree | 04cc3e801ae5f6d6fdbecc981c6d6e9d94403440 /core/Plugin/Visualization.php | |
| parent | b4627cf0324de59f29e8d6e7487f987617c5a4fd (diff) | |
ProxySite related changes to let comparisons work properly (#15265)
* Make sure ProxySite will disable post processor in Visualization where API Proxy is called directly.
* Use Request::process so events are used.
* Remove disable_datatable_post_processing, since it will propagate.
* Only disable for root API request.
* Move nestedApiInvocationCount increment to top of method.
* Directly filter referrer type labels since there are a small number of them (helps comparison & proxysite).
* Fix regression.
* Update expected test files.
* Another regression fixed.
* Try to fix build again.
* fix tests
Diffstat (limited to 'core/Plugin/Visualization.php')
| -rw-r--r-- | core/Plugin/Visualization.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php index 496a09cd1d..0827f46449 100644 --- a/core/Plugin/Visualization.php +++ b/core/Plugin/Visualization.php @@ -332,8 +332,12 @@ class Visualization extends ViewDataTable PluginManager::getInstance()->checkIsPluginActivated($module); + $proxyRequestParams = array_merge($request, [ + 'disable_root_datatable_post_processor' => 1, + ]); + $class = ApiRequest::getClassNameAPI($module); - $dataTable = Proxy::getInstance()->call($class, $method, $request); + $dataTable = Proxy::getInstance()->call($class, $method, $proxyRequestParams); $response = new ResponseBuilder($format = 'original', $request); $response->disableSendHeader(); @@ -520,7 +524,6 @@ class Visualization extends ViewDataTable $postProcessor->setCallbackAfterGenericFilters(function (DataTable\DataTableInterface $dataTable) use ($self) { $self->setDataTable($dataTable); - $self->afterGenericFiltersAreAppliedToLoadedDataTable(); // queue other filters so they can be applied later if queued filters are disabled |