diff options
| author | mattpiwik <matthieu.aubry@gmail.com> | 2012-09-28 07:07:18 +0400 |
|---|---|---|
| committer | mattpiwik <matthieu.aubry@gmail.com> | 2012-09-28 07:07:18 +0400 |
| commit | 976b471ec73c6ba313775d15bbfc5ac0b26459be (patch) | |
| tree | eb24f2a1df6f6b00e50be06a16ceb1441213a3dc /plugins | |
| parent | f90da5ade2720a3fc568f78e9b498a9e615e0cf8 (diff) | |
Refs #2159
* Fixing RowEvolution popover click on selector: Warning:</strong> <i>array_keys() expects parameter 1 to be array, null given</i>
* Changing default monthly to show 2 years history
* Simplifying code of getXAxisStepSize() since it seemed too complicated ;)
* removing incorrect title which was always "Showing evolution over last 30 $period"
git-svn-id: http://dev.piwik.org/svn/trunk@7075 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/CoreHome/DataTableRowAction/RowEvolution.php | 6 | ||||
| -rw-r--r-- | plugins/VisitsSummary/templates/index.tpl | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php index 99efec780b..aeff341877 100644 --- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php @@ -182,7 +182,11 @@ class Piwik_CoreHome_DataTableRowAction_RowEvolution $view = Piwik_ViewDataTable::factory($this->graphType); $view->setDataTable($this->dataTable); $view->init('CoreHome', 'getRowEvolutionGraph', $this->apiMethod); - $view->setColumnsToDisplay(array_keys($this->graphMetrics)); + + if(!empty($this->graphMetrics)) // In row Evolution popover, this is empty + { + $view->setColumnsToDisplay(array_keys($this->graphMetrics)); + } $view->hideAllViewsIcons(); foreach ($this->availableMetrics as $metric => $metadata) diff --git a/plugins/VisitsSummary/templates/index.tpl b/plugins/VisitsSummary/templates/index.tpl index b1b149b9bb..43c7097911 100644 --- a/plugins/VisitsSummary/templates/index.tpl +++ b/plugins/VisitsSummary/templates/index.tpl @@ -1,9 +1,8 @@ {* This graphId must be unique for this report *} <a name="evolutionGraph" graphId="VisitsSummarygetEvolutionGraph"></a> -<h2>{if $period=='range'}{'Referers_Evolution'|translate} - {else}{'VisitsSummary_EvolutionOverLastPeriods'|translate:'30':$periodsNames.$period.plural}{/if} -</h2> +<h2>{'Referers_Evolution'|translate}</h2> + {$graphEvolutionVisitsSummary} <h2>{'General_Report'|translate}</h2> |