diff --git a/config/global.ini.php b/config/global.ini.php index 0d3eddb4ab07aa4bef931b58192c81798f6bb6bb..17adbdea571cdcc97151ab8aedecc37d707fa6aa 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -112,7 +112,7 @@ default_language = en datatable_default_limit = 10 ; default number of rows returned in API responses -API_datatable_default_limit = 50 +API_datatable_default_limit = 100 ; 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. diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php index b88bdf890b0a6bf473f60384c0b09dcebfe7d40d..a19e69ed679e5a3049486befb574c392b7a18d71 100644 --- a/core/ViewDataTable.php +++ b/core/ViewDataTable.php @@ -300,6 +300,7 @@ abstract class Piwik_ViewDataTable $this->viewProperties['show_footer_icons'] = ($this->idSubtable == false); $this->viewProperties['apiMethodToRequestDataTable'] = $this->apiMethodToRequestDataTable; $this->viewProperties['uniqueId'] = $this->getUniqueIdViewDataTable(); + $this->viewProperties['exportLimit'] = Zend_Registry::get('config')->General->API_datatable_default_limit; $standardColumnNameToTranslation = array_merge( Piwik_API_API::getInstance()->getDefaultMetrics(), diff --git a/plugins/CoreHome/templates/datatable_footer.tpl b/plugins/CoreHome/templates/datatable_footer.tpl index c41cd8c8ebcbc157291a0573102434b41d54595e..b7a893512d574eacecd6296d0f49d6d8ffdb2b09 100644 --- a/plugins/CoreHome/templates/datatable_footer.tpl +++ b/plugins/CoreHome/templates/datatable_footer.tpl @@ -63,13 +63,13 @@ <span class="exportToFormatIcons"><a class="tableIcon" var="export"><img width="16" height="16" src="themes/default/images/export.png" title="{'General_ExportThisReport'|translate}" /></a></span> <span class="exportToFormatItems" style="display:none"> {'General_Export'|translate}: - <a target="_blank" methodToCall="{$properties.apiMethodToRequestDataTable}" format="CSV" filter_limit="100">CSV</a> | - <a target="_blank" methodToCall="{$properties.apiMethodToRequestDataTable}" format="TSV" filter_limit="100">TSV (Excel)</a> | - <a target="_blank" methodToCall="{$properties.apiMethodToRequestDataTable}" format="XML" filter_limit="100">XML</a> | - <a target="_blank" methodToCall="{$properties.apiMethodToRequestDataTable}" format="JSON" filter_limit="100">Json</a> | - <a target="_blank" methodToCall="{$properties.apiMethodToRequestDataTable}" format="PHP" filter_limit="100">Php</a> + <a target="_blank" methodToCall="{$properties.apiMethodToRequestDataTable}" format="CSV" filter_limit="{$properties.exportLimit}">CSV</a> | + <a target="_blank" methodToCall="{$properties.apiMethodToRequestDataTable}" format="TSV" filter_limit="{$properties.exportLimit}">TSV (Excel)</a> | + <a target="_blank" methodToCall="{$properties.apiMethodToRequestDataTable}" format="XML" filter_limit="{$properties.exportLimit}">XML</a> | + <a target="_blank" methodToCall="{$properties.apiMethodToRequestDataTable}" format="JSON" filter_limit="{$properties.exportLimit}">Json</a> | + <a target="_blank" methodToCall="{$properties.apiMethodToRequestDataTable}" format="PHP" filter_limit="{$properties.exportLimit}">Php</a> {if $properties.show_export_as_rss_feed} - | <a target="_blank" methodToCall="{$properties.apiMethodToRequestDataTable}" format="RSS" filter_limit="100" date="last10"><img border="0" src="themes/default/images/feed.png" /></a> + | <a target="_blank" methodToCall="{$properties.apiMethodToRequestDataTable}" format="RSS" filter_limit="{$properties.exportLimit}" date="last10"><img border="0" src="themes/default/images/feed.png" /></a> {/if} </span> {if $properties.show_export_as_image_icon}