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:
authorNathan Sollenberger <nsollenberger@gmail.com>2015-05-12 02:13:41 +0300
committerNathan Sollenberger <nsollenberger@gmail.com>2015-05-12 02:13:41 +0300
commit1169e55f2af093a4c29a4892c770cbe403f190e4 (patch)
tree7ac21c2c73dd8fe0c35c39e1bb1b1a7387d7aab0 /plugins/VisitsSummary
parent76a7ec111253a5a9cdc502699e73422ca5c59b7d (diff)
Alternate method to reload VisitsSummary_WidgetOverviewGraph graph
Diffstat (limited to 'plugins/VisitsSummary')
-rw-r--r--plugins/VisitsSummary/Controller.php12
-rw-r--r--plugins/VisitsSummary/templates/index.twig2
2 files changed, 12 insertions, 2 deletions
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index eadc9db07c..71a20ff442 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -39,11 +39,19 @@ class Controller extends \Piwik\Plugin\Controller
{
$view = new View('@VisitsSummary/index');
$this->setPeriodVariablesView($view);
- $view->graphEvolutionVisitsSummary = $this->getEvolutionGraph(array(), array('nb_visits'), __FUNCTION__);
+ $view->graphEvolutionVisitsSummary = $this->getEvolutionGraph(array(), array('nb_visits'), 'getIndexGraph');
$this->setSparklinesAndNumbers($view);
return $view->render();
}
+ // sparkline.js:81 dataTable.trigger('reload', …); does not remove the old headline,
+ // so when updating this graph (such as when selecting a different metric)
+ // ONLY the graph should be returned
+ public function getIndexGraph()
+ {
+ return $this->getEvolutionGraph(array(), array(), __FUNCTION__);
+ }
+
public function getSparklines()
{
$view = new View('@VisitsSummary/getSparklines');
@@ -106,6 +114,8 @@ class Controller extends \Piwik\Plugin\Controller
$selectableColumns[] = 'nb_searches';
$selectableColumns[] = 'nb_keywords';
}
+ // $callingAction may be specified to distinguish between
+ // "VisitsSummary_WidgetLastVisits" and "VisitsSummary_WidgetOverviewGraph"
$view = $this->getLastUnitGraphAcrossPlugins($this->pluginName, $callingAction, $columns,
$selectableColumns, $documentation);
diff --git a/plugins/VisitsSummary/templates/index.twig b/plugins/VisitsSummary/templates/index.twig
index 235ccdbe8b..790d8fda14 100644
--- a/plugins/VisitsSummary/templates/index.twig
+++ b/plugins/VisitsSummary/templates/index.twig
@@ -1,6 +1,6 @@
{# This graphId must be unique for this report #}
<h2 piwik-enriched-headline
- data-graph-id="VisitsSummary.index"
+ data-graph-id="VisitsSummary.getIndexGraph"
>{{ 'General_EvolutionOverPeriod'|translate }}</h2>
{{ graphEvolutionVisitsSummary|raw }}