diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2015-11-04 05:30:26 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2015-11-24 04:04:01 +0300 |
commit | d995029b91f38bd81fbbb50f4d058f3b6b3c18a2 (patch) | |
tree | 3ba63b979bde2da095ddb06bb66fe92b2d72c31b /plugins/Goals | |
parent | f9c851190ed680eb430d9d52040b72c7cf73f62a (diff) |
refs #9129 added feature Custom Dimensions
Diffstat (limited to 'plugins/Goals')
-rw-r--r-- | plugins/Goals/Controller.php | 8 | ||||
-rw-r--r-- | plugins/Goals/Reports/Base.php | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php index 15f7b40aab..7a66581c69 100644 --- a/plugins/Goals/Controller.php +++ b/plugins/Goals/Controller.php @@ -459,8 +459,14 @@ class Controller extends \Piwik\Plugin\Controller } $customParams['viewDataTable'] = $report['viewDataTable']; + if (!empty($report['parameters'])) { + $params = array_merge($customParams, $report['parameters']); + } else { + $params = $customParams; + } + $goalReportsByDimension->addReport( - $categoryText, $report['name'], $report['module'] . '.' . $report['action'], $customParams); + $categoryText, $report['name'], $report['module'] . '.' . $report['action'], $params); } } } diff --git a/plugins/Goals/Reports/Base.php b/plugins/Goals/Reports/Base.php index fd732035d3..3db8c4446b 100644 --- a/plugins/Goals/Reports/Base.php +++ b/plugins/Goals/Reports/Base.php @@ -33,7 +33,7 @@ abstract class Base extends \Piwik\Plugin\Report $this->parameters = array('idGoal' => $goal['idgoal']); $this->order = $this->orderGoal + $goal['idgoal'] * 3; - $availableReports[] = $this->buildReportMetadata($availableReports, $infos); + $availableReports[] = $this->buildReportMetadata(); } $this->init(); |