diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2018-11-13 04:18:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 04:18:54 +0300 |
| commit | d3342958bb47786286180388773c7c55dbbe2739 (patch) | |
| tree | 691e3655eb69b3ed27c809d906ce8bd30323833d /plugins/Insights | |
| parent | 66148cca359a6aca6123edb899544f43e90be0b7 (diff) | |
In API requests made by Insights, make sure existing query params do not affect requests. (#13700)
* In API requests made by Insights, make sure existing query params do not affect requests.
* Update two screenshots
Diffstat (limited to 'plugins/Insights')
| -rw-r--r-- | plugins/Insights/API.php | 4 | ||||
| -rw-r--r-- | plugins/Insights/Model.php | 5 | ||||
| -rw-r--r-- | plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/plugins/Insights/API.php b/plugins/Insights/API.php index 23e9bc23f5..9a7af20398 100644 --- a/plugins/Insights/API.php +++ b/plugins/Insights/API.php @@ -317,7 +317,6 @@ class API extends \Piwik\Plugin\API private function requestApiMethod($method, $idSite, $period, $date, $reportId, $segment, $additionalParams) { $params = array( - 'method' => 'Insights.' . $method, 'idSite' => $idSite, 'date' => $date, 'period' => $period, @@ -335,8 +334,7 @@ class API extends \Piwik\Plugin\API } } - $request = new ApiRequest($params); - return $request->process(); + return ApiRequest::processRequest('Insights.' . $method, $params, $default = []); } } diff --git a/plugins/Insights/Model.php b/plugins/Insights/Model.php index 7f1d906c16..d7687e2f90 100644 --- a/plugins/Insights/Model.php +++ b/plugins/Insights/Model.php @@ -36,7 +36,6 @@ class Model $report = $this->getReportByUniqueId($idSite, $reportUniqueId); $params = array( - 'method' => $report['module'] . '.' . $report['action'], 'format' => 'original', 'idSite' => $idSite, 'period' => $period, @@ -53,9 +52,7 @@ class Model $params = array_merge($params, $report['parameters']); } - $request = new ApiRequest($params); - $table = $request->process(); - + $table = ApiRequest::processRequest($report['module'] . '.' . $report['action'], $params, $default = []); return $table; } diff --git a/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png b/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png index 6aa24fc606..6ca527679f 100644 --- a/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png +++ b/plugins/Insights/tests/UI/expected-screenshots/Insights_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d0d849e7426f94a1aff4bccb05453ce961465eb47e145882564b39943d97590a -size 152855 +oid sha256:7a63d797d6a58578ab72b600806c9dc3a702c499918f0032b76e2fb27e57ba19 +size 151012 |
