diff --git a/core/ViewDataTable/Config.php b/core/ViewDataTable/Config.php index 77331390be8d9b44069aeba073ef9bfdeee97a88..150c3f42d7377a9a3f0da24a6548eb0af7ea2f3d 100644 --- a/core/ViewDataTable/Config.php +++ b/core/ViewDataTable/Config.php @@ -121,7 +121,6 @@ class Config 'show_pagination_control', 'show_offset_information', 'hide_annotations_view', - 'export_limit', 'columns_to_display' ); @@ -455,13 +454,6 @@ class Config */ public $hide_annotations_view = true; - /** - * The filter_limit query parameter value to use in export links. - * - * Defaulted to the value of the `[General] API_datatable_default_limit` INI config option. - */ - public $export_limit = ''; - /** * Message to show if not data is available for the report * Defaults to `CoreHome_ThereIsNoDataForThisReport` if not set @@ -492,7 +484,6 @@ class Config */ public function __construct() { - $this->export_limit = \Piwik\Config::getInstance()->General['API_datatable_default_limit']; $this->translations = array_merge( Metrics::getDefaultMetrics(), Metrics::getDefaultProcessedMetrics() diff --git a/plugins/CoreHome/templates/_dataTableActions.twig b/plugins/CoreHome/templates/_dataTableActions.twig index 2f4c813b4ee8c9bc047c37abb9c9ad87e97e4ceb..dca99c47c758475004e014f503181f989f093416 100644 --- a/plugins/CoreHome/templates/_dataTableActions.twig +++ b/plugins/CoreHome/templates/_dataTableActions.twig @@ -70,13 +70,13 @@ <ul id='dropdownExport{{ randomIdForDropdown }}' class='dropdown-content exportToFormatItems'> {% set requestParams = properties.request_parameters_to_modify|json_encode %} - <li><a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="CSV" filter_limit="{{ properties.export_limit }}">CSV</a></li> - <li><a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="TSV" filter_limit="{{ properties.export_limit }}">TSV (Excel)</a></li> - <li><a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="XML" filter_limit="{{ properties.export_limit }}">XML</a></li> - <li><a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="JSON" filter_limit="{{ properties.export_limit }}">Json</a></li> - <li><a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="PHP" filter_limit="{{ properties.export_limit }}">Php</a></li> + <li><a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="CSV" filter_limit="{{ properties.filter_limit }}">CSV</a></li> + <li><a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="TSV" filter_limit="{{ properties.filter_limit }}">TSV (Excel)</a></li> + <li><a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="XML" filter_limit="{{ properties.filter_limit }}">XML</a></li> + <li><a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="JSON" filter_limit="{{ properties.filter_limit }}">Json</a></li> + <li><a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="PHP" filter_limit="{{ properties.filter_limit }}">Php</a></li> {% if properties.show_export_as_rss_feed %} - <li><a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="RSS" filter_limit="{{ properties.export_limit }}" date="last10"> + <li><a target="_blank" requestParams="{{ requestParams|e('html_attr') }}" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="RSS" filter_limit="{{ properties.filter_limit }}" date="last10"> <span class="icon-feed"></span> RSS </a> </li>