diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2015-02-15 23:38:38 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2015-02-15 23:38:38 +0300 |
commit | 7d97c52b07dae7a774e6da85f84ad32ca10ba0ad (patch) | |
tree | ea94b11d8d61ef17e1a886948466b7220fce6eef /plugins/Events | |
parent | 10a528b3d6ff3dc3269f9d5d408caea1e52d3ed4 (diff) |
refs #4633 make sure the keyword filter only includes results that were a search, do not display segment icon in subtables of events
Diffstat (limited to 'plugins/Events')
-rw-r--r-- | plugins/Events/API.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/plugins/Events/API.php b/plugins/Events/API.php index 345deb4f96..bb6584b777 100644 --- a/plugins/Events/API.php +++ b/plugins/Events/API.php @@ -154,13 +154,17 @@ class API extends \Piwik\Plugin\API $this->checkSecondaryDimension($name, $secondaryDimension); $recordName = $this->getRecordNameForAction($name, $secondaryDimension); $dataTable = Archive::getDataTableFromArchive($recordName, $idSite, $period, $date, $segment, $expanded, $idSubtable); - $dataTable->filter('AddSegmentValue', array(function ($label) { - if ($label === Archiver::EVENT_NAME_NOT_SET) { - return false; - } - return $label; - })); + if (empty($idSubtable)) { + $dataTable->filter('AddSegmentValue', array(function ($label) { + if ($label === Archiver::EVENT_NAME_NOT_SET) { + return false; + } + + return $label; + })); + } + $this->filterDataTable($dataTable); return $dataTable; } |