diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-07 09:29:01 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-07 09:29:01 +0400 |
| commit | bc4c240385d51b91419f3484819dfc7e35eaf261 (patch) | |
| tree | 6f685c84b68475cf29b497d3b28872b89e0e435b /core/ViewDataTable | |
| parent | 0d37b7f1de8a5e5eedc29a5b0c9091bb24217173 (diff) | |
| parent | 715cff5e3e0affc9c250eaacbcd5bc05308f4bc0 (diff) | |
Merge branch 'master' into report_and_dimension_refactoring
Conflicts:
core/FrontController.php
core/Log.php
plugins/API/API.php
tests/PHPUnit/Fixture.php
tests/PHPUnit/UI
Diffstat (limited to 'core/ViewDataTable')
| -rw-r--r-- | core/ViewDataTable/Config.php | 5 | ||||
| -rw-r--r-- | core/ViewDataTable/Manager.php | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/core/ViewDataTable/Config.php b/core/ViewDataTable/Config.php index 383ae043c0..8fbdf85321 100644 --- a/core/ViewDataTable/Config.php +++ b/core/ViewDataTable/Config.php @@ -160,6 +160,11 @@ class Config public $show_goals = false; /** + * Controls whether the 'insights' footer icon is shown. + */ + public $show_insights = true; + + /** * Array property mapping DataTable column names with their internationalized names. * * The default value for this property is set elsewhere. It will contain translations diff --git a/core/ViewDataTable/Manager.php b/core/ViewDataTable/Manager.php index 24616ece5c..0559661d44 100644 --- a/core/ViewDataTable/Manager.php +++ b/core/ViewDataTable/Manager.php @@ -242,7 +242,9 @@ class Manager $graphViewIcons['buttons'] = array_filter($graphViewIcons['buttons']); - if (!empty($insightsViewIcons['buttons'])) { + if (!empty($insightsViewIcons['buttons']) + && $view->config->show_insights + ) { $result[] = $insightsViewIcons; } |