diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index a4b8a4ccb..d212bdd61 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -747,6 +747,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay $iNbItems = $iPage * MetaModel::GetConfig()->GetMinDisplayLimit(); $sCombo .= ""; } + $sCombo .= ""; $sCombo .= ''; $sPages = Dict::S('UI:Pagination:PagesLabel'); $sPageSizeCombo = Dict::Format('UI:Pagination:PageSize', $sCombo); diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php index 1c531d4ca..6a70fa326 100644 --- a/dictionaries/dictionary.itop.ui.php +++ b/dictionaries/dictionary.itop.ui.php @@ -919,5 +919,6 @@ When associated with a trigger, each action is given an "order" number, specifyi 'UI:Pagination:HeaderNoSelection' => 'Total: %1$s objects.', 'UI:Pagination:PageSize' => '%1$s objects per page', 'UI:Pagination:PagesLabel' => 'Pages:', + 'UI:Pagination:All' => 'All', )); ?> diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index f47581e65..277a182c8 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -769,5 +769,6 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé 'UI:Pagination:HeaderNoSelection' => 'Total: %1$s éléments.', 'UI:Pagination:PageSize' => '%1$s éléments par page', 'UI:Pagination:PagesLabel' => 'Pages:', + 'UI:Pagination:All' => 'Tous', )); ?> diff --git a/js/jquery.tablesorter.pager.js b/js/jquery.tablesorter.pager.js index d8757e88b..eafa8a0be 100644 --- a/js/jquery.tablesorter.pager.js +++ b/js/jquery.tablesorter.pager.js @@ -15,6 +15,10 @@ function sprintf(format, etc) { function setPageSize(table,size) { var c = table.config; + if (size == -1) + { + size = c.totalRows; + } c.size = size; c.totalPages = Math.ceil(c.totalRows / c.size); c.pagerPositionSet = false;