Add new setting datatable_export_range_as_day = "rss" to let users customise the list of formats for which the data should be exported daily instead of, for the overall range.

3 files changed, 9 insertions, 3 deletions

diff --git a/config/global.ini.php b/config/global.ini.php
index 553d6a9c14..78204437b4 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -156,6 +156,11 @@ datatable_default_limit = 10
 ; default number of rows returned in API responses
 API_datatable_default_limit = 100
 
+; When period=range, below the datatables, when user clicks on "export", the data will be aggregate of the range.
+; Here you can specify the comma separated list of formats for which the data will be exported aggregated by day
+; (ie. there will be a new "date" column). For example set to: "rss,tsv,csv"
+datatable_export_range_as_day = "rss"
+
 ; This setting is overriden in the UI, under "User Settings".
 ; The date and period loaded by Piwik uses the defaults below. Possible values: yesterday, today.
 default_day = yesterday
diff --git a/core/Config.php b/core/Config.php
index 44af08de23..abbc604f04 100644
--- a/core/Config.php
+++ b/core/Config.php
@@ -216,7 +216,8 @@ class Config extends Singleton
 
         return array(
             'action_url_category_delimiter' => $general['action_url_category_delimiter'],
-            'autocomplete_min_sites' => $general['autocomplete_min_sites']
+            'autocomplete_min_sites' => $general['autocomplete_min_sites'],
+            'datatable_export_range_as_day' => $general['datatable_export_range_as_day']
         );
     }
 
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
index 60e88c6232..153133f9d6 100644
--- a/plugins/CoreHome/javascripts/dataTable.js
+++ b/plugins/CoreHome/javascripts/dataTable.js
@@ -983,8 +983,8 @@ $.extend(DataTable.prototype, UIControl.prototype, {
                 }
                 var period = self.param.period;
 
-                // RSS does not work for period=range
-                if (format == 'RSS'
+                var formatsUseDayNotRange = piwik.config.datatable_export_range_as_day.toLowerCase();
+                if (formatsUseDayNotRange.indexOf(format.toLowerCase()) != -1
                     && self.param.period == 'range') {
                     period = 'day';
                 }