Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorBen Burgess <88810029+bx80@users.noreply.github.com>2022-05-24 10:51:06 +0300
committerGitHub <noreply@github.com>2022-05-24 10:51:06 +0300
commitfdbcb562ef9e200c860fa3d40f664cac873ea8e8 (patch)
tree303d03c08977daa3603b443b637ba50c331a76fc /core
parent72f3d296d2b7dc6bb4348f401fa427262d72b374 (diff)
Show sparkline evolution figures for visits, goals and ecommerce overviews (#19057)
* Add evolution to sparklines on the visits overview and the goals overview * Add evolution to sparklines on the ecommerce overview * Updated UI test screenshots * Update submodule * Fix for tooltip date formatting, improved translation lookup and callback method extra parameter documentation * Sparklines API calls modified to return unformatted values, formatting added to the sparkline visualization and overview reports * update submodule * Updated inherited method signature * Code improvements, added forcedParams parameter to ViewDataTable / Visualization loadDataTableFromAPI methods * Revert change to loadDataTableFromAPI method signature in ViewDataTable and Visualization classes * Remove incorrectly added file * Improve international handling of plus symbol in ecommerce overview template * Always use gigabytes when formatting byte values for evolution charts * update sumbodule * built vue files * System test updates * UI test screenshot updates * Update submodule * Test fix * Test fixes * Update system tests * Rerun tests * Fix for unformatted metrics when comparing * Update UI test screenshots for sparkline comparisons * apply some fixes * Update submodule Co-authored-by: sgiehl <stefan@matomo.org> Co-authored-by: sgiehl <sgiehl@users.noreply.github.com>
Diffstat (limited to 'core')
-rw-r--r--core/Plugin/Visualization.php3
-rw-r--r--core/ViewDataTable/Request.php6
2 files changed, 4 insertions, 5 deletions
diff --git a/core/Plugin/Visualization.php b/core/Plugin/Visualization.php
index b2ff753f31..77058e6416 100644
--- a/core/Plugin/Visualization.php
+++ b/core/Plugin/Visualization.php
@@ -310,9 +310,6 @@ class Visualization extends ViewDataTable
return $hasData;
}
- /**
- * @internal
- */
protected function loadDataTableFromAPI()
{
if (!is_null($this->dataTable)) {
diff --git a/core/ViewDataTable/Request.php b/core/ViewDataTable/Request.php
index d5227619a2..02ab4bab29 100644
--- a/core/ViewDataTable/Request.php
+++ b/core/ViewDataTable/Request.php
@@ -29,12 +29,14 @@ class Request
* The function init() must have been called before, so that the object knows which API module and action to call.
* It builds the API request string and uses Request to call the API.
* The requested DataTable object is stored in $this->dataTable.
+ *
+ * @param array $forcedParams Optional parameters which will be used to overwrite the request parameters
*/
- public function loadDataTableFromAPI($extraParams = [])
+ public function loadDataTableFromAPI($forcedParams = [])
{
// we build the request (URL) to call the API
$requestArray = $this->getRequestArray();
- $requestArray = array_merge($extraParams, $requestArray);
+ $requestArray = array_merge($requestArray, $forcedParams);
// we make the request to the API
$request = new ApiRequest($requestArray);