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
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2022-05-17 11:43:10 +0300
committerGitHub <noreply@github.com>2022-05-17 11:43:10 +0300
commitf4915657a65088de22bdfa2c380d08f634136061 (patch)
tree1694752be3cadb53c0295cff310e591d58ef9796 /plugins
parent47e3435a12c590f2cf29d78257a4775adf4a7b1c (diff)
Ensure goal sparklines show the correct goal (#19226)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/CoreVisualizations/Visualizations/Sparklines.php4
-rw-r--r--plugins/CoreVisualizations/Visualizations/Sparklines/Config.php5
-rw-r--r--plugins/Goals/Controller.php5
3 files changed, 11 insertions, 3 deletions
diff --git a/plugins/CoreVisualizations/Visualizations/Sparklines.php b/plugins/CoreVisualizations/Visualizations/Sparklines.php
index c8fe429659..789cdbb251 100644
--- a/plugins/CoreVisualizations/Visualizations/Sparklines.php
+++ b/plugins/CoreVisualizations/Visualizations/Sparklines.php
@@ -172,11 +172,11 @@ class Sparklines extends ViewDataTable
continue;
}
- $sparklineUrlParams = array(
+ $sparklineUrlParams = array_merge($this->config->custom_parameters, array(
'columns' => $column,
'module' => $this->requestConfig->getApiModuleToRequest(),
'action' => $this->requestConfig->getApiMethodToRequest()
- );
+ ));
if ($this->isComparing() && !empty($comparisons)) {
$periodObj = Factory::build($originalPeriod, $originalDate);
diff --git a/plugins/CoreVisualizations/Visualizations/Sparklines/Config.php b/plugins/CoreVisualizations/Visualizations/Sparklines/Config.php
index 1fdda31c77..c75acce00b 100644
--- a/plugins/CoreVisualizations/Visualizations/Sparklines/Config.php
+++ b/plugins/CoreVisualizations/Visualizations/Sparklines/Config.php
@@ -47,6 +47,11 @@ class Config extends \Piwik\ViewDataTable\Config
public $title_attributes = array();
/**
+ * Defines custom parameters that will be appended to the sparkline image urls
+ */
+ public $custom_parameters = [];
+
+ /**
* If supplied, this function is used to compute the evolution percent displayed next to non-comparison sparkline views.
*
* The function is passed an array mapping column names with column values.
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 247a579cd2..045d177e4d 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -266,10 +266,13 @@ class Controller extends \Piwik\Plugin\Controller
'only_summary' => 1,
];
- \Piwik\Context::executeWithQueryParameters($params, function() use (&$content) {
+ \Piwik\Context::executeWithQueryParameters($params, function () use (&$content, $goal) {
//load Visualisations Sparkline
$view = ViewDataTableFactory::build(Sparklines::ID, 'Goals.getMetrics', 'Goals.' . __METHOD__, true);
$view->config->show_title = true;
+ $view->config->custom_parameters = [
+ 'idGoal' => $goal['idgoal'],
+ ];
$content .= $view->render();
});
}