lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 04:19:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

#20182 : Admin Content browser ""Show: All" displays pager.

Browse Source 
Work Item: 20182
This commit is contained in:
Jack Cheng
2015-03-05 10:12:20 +00:00
committed by agriffard
parent 691c04016c
commit b03c1bc901
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Core/Shapes/CoreShapes.cs
View File

@@ -449,14 +449,12 @@ namespace Orchard.Core.Shapes {
currentPage = 1;
var pageSize = PageSize;
if (pageSize < 1)
pageSize = _workContext.Value.CurrentSite.PageSize;
var numberOfPagesToShow = Quantity ?? 0;
if (Quantity == null || Quantity < 0)
numberOfPagesToShow = 7;
var totalPageCount = (int)Math.Ceiling(TotalItemCount / pageSize);
var totalPageCount = pageSize > 0 ? (int)Math.Ceiling(TotalItemCount / pageSize) : 1;
var firstText = FirstText ?? T("<<");
var previousText = PreviousText ?? T("<");
@@ -529,7 +527,7 @@ namespace Orchard.Core.Shapes {
}
// page numbers
if (numberOfPagesToShow > 0) {
if (numberOfPagesToShow > 0 && lastPage > 1) {
for (var p = firstPage; p <= lastPage; p++) {
if (p == currentPage) {
Shape.Add(New.Pager_CurrentPage(Value: p, RouteValues: new RouteValueDictionary(routeData), Pager: Shape));