Skip to content
Extraits de code Groupes Projets
Valider 59ad25cc rédigé par mattpiwik's avatar mattpiwik
Parcourir les fichiers

Fixes #1428

Page titles, Page URLs reports now have pagination like other datatables.

git-svn-id: http://dev.piwik.org/svn/trunk@2339 59fd770c-687e-43c8-a1e3-f5a4ff64c105
parent ff7d337c
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -133,6 +133,8 @@ datatable_archiving_maximum_rows_subtable_referers = 50 ...@@ -133,6 +133,8 @@ datatable_archiving_maximum_rows_subtable_referers = 50
; maximum number of rows for any of the Actions tables (pages, downloads, outlinks) ; maximum number of rows for any of the Actions tables (pages, downloads, outlinks)
datatable_archiving_maximum_rows_actions = 500 datatable_archiving_maximum_rows_actions = 500
; maximum number of rows for pages in categories (sub pages, when clicking on the + for a page category) ; maximum number of rows for pages in categories (sub pages, when clicking on the + for a page category)
; note: should not exceed the display limit in Piwik_Actions_Controller::ACTIONS_REPORT_ROWS_DISPLAY
; because each subdirectory doesn't have paging at the bottom, so all data should be displayed if possible.
datatable_archiving_maximum_rows_subtable_actions = 100 datatable_archiving_maximum_rows_subtable_actions = 100
; maximum number of rows for other tables (Providers, User settings configurations) ; maximum number of rows for other tables (Providers, User settings configurations)
......
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
*/ */
class Piwik_Actions_Controller extends Piwik_Controller class Piwik_Actions_Controller extends Piwik_Controller
{ {
const ACTIONS_REPORT_ROWS_DISPLAY = 100;
protected function getPageUrlsView($currentAction, $controllerActionSubtable) protected function getPageUrlsView($currentAction, $controllerActionSubtable)
{ {
$view = Piwik_ViewDataTable::factory(); $view = Piwik_ViewDataTable::factory();
...@@ -247,11 +249,10 @@ class Piwik_Actions_Controller extends Piwik_Controller ...@@ -247,11 +249,10 @@ class Piwik_Actions_Controller extends Piwik_Controller
$view->setTemplate('CoreHome/templates/datatable_actions_recursive.tpl'); $view->setTemplate('CoreHome/templates/datatable_actions_recursive.tpl');
} }
// disable Footer icons // disable Footer icons
$view->disableOffsetInformation();
$view->disableShowAllViewsIcons(); $view->disableShowAllViewsIcons();
$view->disableShowAllColumns(); $view->disableShowAllColumns();
$view->setLimit( 100 ); $view->setLimit( self::ACTIONS_REPORT_ROWS_DISPLAY );
$view->main(); $view->main();
// we need to rewrite the phpArray so it contains all the recursive arrays // we need to rewrite the phpArray so it contains all the recursive arrays
if($currentlySearching) if($currentlySearching)
......
...@@ -746,6 +746,7 @@ actionDataTable.prototype = ...@@ -746,6 +746,7 @@ actionDataTable.prototype =
onClickSort: dataTable.prototype.onClickSort, onClickSort: dataTable.prototype.onClickSort,
handleLinkedRows: dataTable.prototype.handleLinkedRows, handleLinkedRows: dataTable.prototype.handleLinkedRows,
truncate: dataTable.prototype.truncate, truncate: dataTable.prototype.truncate,
handleOffsetInformation: dataTable.prototype.handleOffsetInformation,
//initialisation of the actionDataTable //initialisation of the actionDataTable
init: function(workingDivId, domElem) init: function(workingDivId, domElem)
...@@ -786,7 +787,7 @@ actionDataTable.prototype = ...@@ -786,7 +787,7 @@ actionDataTable.prototype =
self.handleExportBox(domElem); self.handleExportBox(domElem);
self.handleSort(domElem); self.handleSort(domElem);
self.handleLinkedRows(domElem); self.handleLinkedRows(domElem);
self.handleOffsetInformation(domElem);
if( self.workingDivId != undefined) if( self.workingDivId != undefined)
{ {
self.handleSearchBox(domElem, self.dataTableLoaded ); self.handleSearchBox(domElem, self.dataTableLoaded );
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter