From cde16c2fa849e1b54bbcb83096b608522ba26202 Mon Sep 17 00:00:00 2001
From: Stefan Giehl <stefan@piwik.org>
Date: Wed, 13 Sep 2017 17:01:54 +0200
Subject: [PATCH] reuse event action methods in event columns (#12048)
---
plugins/Events/Columns/EventAction.php | 2 +-
plugins/Events/Columns/EventCategory.php | 2 +-
plugins/Events/Columns/EventName.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/plugins/Events/Columns/EventAction.php b/plugins/Events/Columns/EventAction.php
index 1e19061979..30c33fe8da 100644
--- a/plugins/Events/Columns/EventAction.php
+++ b/plugins/Events/Columns/EventAction.php
@@ -45,7 +45,7 @@ class EventAction extends ActionDimension
return false;
}
- $eventAction = $request->getParam('e_a');
+ $eventAction = $action->getEventAction();
$eventAction = trim($eventAction);
if (strlen($eventAction) > 0) {
diff --git a/plugins/Events/Columns/EventCategory.php b/plugins/Events/Columns/EventCategory.php
index f74f785a3c..731dd9615c 100644
--- a/plugins/Events/Columns/EventCategory.php
+++ b/plugins/Events/Columns/EventCategory.php
@@ -45,7 +45,7 @@ class EventCategory extends ActionDimension
return false;
}
- $eventCategory = $request->getParam('e_c');
+ $eventCategory = $action->getEventCategory();
$eventCategory = trim($eventCategory);
if (strlen($eventCategory) > 0) {
diff --git a/plugins/Events/Columns/EventName.php b/plugins/Events/Columns/EventName.php
index e672d316a3..bbe01ae0ff 100644
--- a/plugins/Events/Columns/EventName.php
+++ b/plugins/Events/Columns/EventName.php
@@ -43,7 +43,7 @@ class EventName extends ActionDimension
return false;
}
- $eventName = $request->getParam('e_n');
+ $eventName = $action->getEventName();
$eventName = trim($eventName);
if (strlen($eventName) > 0) {
--
GitLab