From 5bfc927c6db2824efa107fd6130ed36b2cd67143 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Mon, 21 Oct 2013 00:58:42 +0000
Subject: [PATCH] renamed property show_graph_views_icons ->
show_all_views_icons
---
core/Plugin/ViewDataTable.php | 2 +-
core/ViewDataTable/Config.php | 4 ++--
core/ViewDataTable/Manager.php | 2 +-
plugins/Actions/Actions.php | 4 ++--
plugins/CoreHome/DataTableRowAction/RowEvolution.php | 2 +-
.../Visualizations/JqplotGraph/Evolution/Config.php | 2 +-
plugins/Goals/Goals.php | 6 +++---
plugins/Live/Live.php | 2 +-
plugins/UserSettings/UserSettings.php | 2 +-
plugins/VisitorInterest/VisitorInterest.php | 4 ++--
10 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/core/Plugin/ViewDataTable.php b/core/Plugin/ViewDataTable.php
index cc57e5e0f1..a5d4b61648 100644
--- a/core/Plugin/ViewDataTable.php
+++ b/core/Plugin/ViewDataTable.php
@@ -297,6 +297,6 @@ abstract class ViewDataTable implements ViewInterface
public static function canDisplayViewDataTable(ViewDataTable $view)
{
- return $view->config->show_graph_views_icons;
+ return $view->config->show_all_views_icons;
}
}
\ No newline at end of file
diff --git a/core/ViewDataTable/Config.php b/core/ViewDataTable/Config.php
index b9bf673c4d..233f9f21c8 100644
--- a/core/ViewDataTable/Config.php
+++ b/core/ViewDataTable/Config.php
@@ -179,11 +179,11 @@ class Config
public $columns_to_display = array();
/**
- * Controls whether the graph footer icons are shown or not.
+ * Controls whether graph and non core viewDataTable footer icons are shown or not.
*
* Default value: true
*/
- public $show_graph_views_icons = true;
+ public $show_all_views_icons = true;
/**
* Controls whether to display a tiny upside-down caret over the currently active view icon.
diff --git a/core/ViewDataTable/Manager.php b/core/ViewDataTable/Manager.php
index c3c3b0cccc..c6516b6c52 100644
--- a/core/ViewDataTable/Manager.php
+++ b/core/ViewDataTable/Manager.php
@@ -169,7 +169,7 @@ class Manager
'buttons' => array(),
);
- if ($view->config->show_graph_views_icons) {
+ if ($view->config->show_all_views_icons) {
if ($view->config->show_bar_chart) {
$graphViewIcons['buttons'][] = static::getFooterIconFor(Bar::ID);
}
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 3154c2ac75..9687b95799 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -692,7 +692,7 @@ class Actions extends \Piwik\Plugin
if ($this->pluginName == $view->requestConfig->getApiModuleToRequest()) {
if ($view->isRequestingSingleDataTable()) {
// make sure custom visualizations are shown on actions reports
- $view->config->show_graph_views_icons = true;
+ $view->config->show_all_views_icons = true;
$view->config->show_bar_chart = false;
$view->config->show_pie_chart = false;
$view->config->show_tag_cloud = false;
@@ -706,7 +706,7 @@ class Actions extends \Piwik\Plugin
$view->config->search_recursive = true;
$view->config->show_table_all_columns = false;
$view->requestConfig->filter_limit = self::ACTIONS_REPORT_ROWS_DISPLAY;
- $view->config->show_graph_views_icons = false;
+ $view->config->show_all_views_icons = false;
if ($view->isViewDataTableId(HtmlTable::ID)) {
$view->config->show_embedded_subtable = true;
diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php
index 427d455bda..13b63610db 100644
--- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php
+++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php
@@ -198,7 +198,7 @@ class RowEvolution
}
$view->config->show_goals = false;
- $view->config->show_graph_views_icons = false;
+ $view->config->show_all_views_icons = false;
$view->config->show_active_view_icon = false;
$view->config->show_related_reports = false;
$view->config->show_series_picker = false;
diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution/Config.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution/Config.php
index 0a642eb3a5..5596d0456f 100644
--- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution/Config.php
+++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution/Config.php
@@ -29,7 +29,7 @@ class Config extends JqplotGraphConfig
{
parent::__construct();
- $this->show_graph_views_icons = false;
+ $this->show_all_views_icons = false;
$this->show_table = false;
$this->show_table_all_columns = false;
$this->hide_annotations_view = false;
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index 57e905640e..4c0265bdd8 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -569,7 +569,7 @@ class Goals extends \Piwik\Plugin
$view->config->columns_to_display = array('label', 'nb_conversions');
$view->config->show_offset_information = false;
$view->config->show_pagination_control = false;
- $view->config->show_graph_views_icons = false;
+ $view->config->show_all_views_icons = false;
$view->requestConfig->filter_sort_column = 'label';
$view->requestConfig->filter_sort_order = 'asc';
@@ -586,7 +586,7 @@ class Goals extends \Piwik\Plugin
$view->config->show_search = false;
$view->config->show_exclude_low_population = false;
$view->config->show_table_all_columns = false;
- $view->config->show_graph_views_icons = false;
+ $view->config->show_all_views_icons = false;
$view->config->show_offset_information = false;
$view->config->show_pagination_control = false;
$view->config->columns_to_display = array('label', 'nb_conversions');
@@ -611,7 +611,7 @@ class Goals extends \Piwik\Plugin
$view->config->show_ecommerce = true;
$view->config->show_table = false;
- $view->config->show_graph_views_icons = false;
+ $view->config->show_all_views_icons = false;
$view->config->show_exclude_low_population = false;
$view->config->show_table_all_columns = false;
$view->config->addTranslation('label', $label);
diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php
index bbab6290cf..fd73ccadf1 100644
--- a/plugins/Live/Live.php
+++ b/plugins/Live/Live.php
@@ -97,7 +97,7 @@ class Live extends \Piwik\Plugin
$view->config->show_search = false;
$view->config->show_exclude_low_population = false;
$view->config->show_offset_information = false;
- $view->config->show_graph_views_icons = false;
+ $view->config->show_all_views_icons = false;
$view->config->show_table_all_columns = false;
$view->config->show_export_as_rss_feed = false;
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index 3063b6c7f2..540a20a5de 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -329,7 +329,7 @@ class UserSettings extends \Piwik\Plugin
$view->config->show_offset_information = false;
$view->config->show_pagination_control = false;
$view->config->show_limit_control = false;
- $view->config->show_graph_views_icons = false;
+ $view->config->show_all_views_icons = false;
$view->config->show_table_all_columns = false;
$view->config->columns_to_display = array('label', 'nb_visits_percentage', 'nb_visits');
$view->config->show_footer_message = Piwik::translate('UserSettings_PluginDetectionDoesNotWorkInIE');
diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php
index 8dbcf130fe..6651c4d4ca 100644
--- a/plugins/VisitorInterest/VisitorInterest.php
+++ b/plugins/VisitorInterest/VisitorInterest.php
@@ -237,7 +237,7 @@ class VisitorInterest extends \Piwik\Plugin
$view->config->show_limit_control = false;
$view->config->show_search = false;
$view->config->show_table_all_columns = false;
- $view->config->show_graph_views_icons = false;
+ $view->config->show_all_views_icons = false;
}
private function configureViewForGetNumberOfVisitsByDaysSinceLast(ViewDataTable $view)
@@ -251,7 +251,7 @@ class VisitorInterest extends \Piwik\Plugin
$view->config->show_offset_information = false;
$view->config->show_pagination_control = false;
$view->config->show_limit_control = false;
- $view->config->show_graph_views_icons = false;
+ $view->config->show_all_views_icons = false;
$view->config->show_table_all_columns = false;
$view->config->show_exclude_low_population = false;
$view->config->addTranslation('label', Piwik::translate('General_DaysSinceLastVisit'));
--
GitLab