From 9302709b4beccdd1d94b58e0791a8373b89d355e Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Fri, 10 May 2013 20:17:14 +1200
Subject: [PATCH] * fixing error/bug in Transition * Multi-Row evolution +
Limit selector "10/50/100/500" now works as expected
---
plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php | 3 ++-
plugins/Transitions/API.php | 5 +----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
index 4c4a964c2e..1e761a0aae 100644
--- a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
+++ b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
@@ -74,12 +74,13 @@ class Piwik_CoreHome_DataTableRowAction_MultiRowEvolution
/**
* Generic method to get an evolution graph or a sparkline for the row evolution popover.
* Do as much as possible from outside the controller.
+ *
* @return Piwik_ViewDataTable
*/
public function getRowEvolutionGraph()
{
$view = parent::getRowEvolutionGraph();
- $view->setCustomParameter(self::IS_MULTI_EVOLUTION_PARAM, true);
+ $view->setCustomParameter(self::IS_MULTI_EVOLUTION_PARAM, 1); // set in JS
return $view;
}
}
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 4457d71046..6712045238 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -139,7 +139,7 @@ class Piwik_Transitions_API
if ($id < 0) {
// an example where this is needed is urls containing < or >
$actionName = $originalActionName;
- $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_url', Piwik_SegmentExpression::MATCH_EQUALs, 'pageUrl');
+ $id = $actionsPlugin->getIdActionFromSegment($actionName, 'idaction_url', Piwik_SegmentExpression::MATCH_EQUAL, 'pageUrl');
}
return $id;
@@ -289,9 +289,6 @@ class Piwik_Transitions_API
}
}
- /**
- * @ignore
- */
public function getTranslations()
{
$controller = new Piwik_Transitions_Controller();
--
GitLab