Forráskód Böngészése

Added an option to the paginated display: display all elements on one page.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1374 a333f486-631f-4898-b8df-5754b55c2be0
dflaven 14 éve
szülő
commit
45571f75c3

+ 1 - 0
application/cmdbabstract.class.inc.php

@@ -747,6 +747,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 				$iNbItems = $iPage * MetaModel::GetConfig()->GetMinDisplayLimit();
 				$sCombo .= "<option  $sSelected value=\"$iNbItems\">$iNbItems</option>";
 			}
+			$sCombo .= "<option  $sSelected value=\"-1\">".Dict::S('UI:Pagination:All')."</option>";
 			$sCombo .= '</select>';
 			$sPages = Dict::S('UI:Pagination:PagesLabel');
 			$sPageSizeCombo = Dict::Format('UI:Pagination:PageSize', $sCombo);

+ 1 - 0
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',
 ));
 ?>

+ 1 - 0
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',
 ));
 ?>

+ 4 - 0
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;