From 3c00aa78136c16c039b81a132c1634808450b928 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Wed, 26 Jan 2011 08:18:36 -0800 Subject: [PATCH] Displaying PageSize drop down in Users administration --HG-- branch : dev extra : transplant_source : %3A%C2%F4%5B%B3r%07%96hx%87%29_%05%8Fs%8A%EC%B9%90 --- .../Modules/Orchard.Users/Views/Admin/Index.cshtml | 13 +++++++++++++ src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml index 7c7ba8b71..245c6f713 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml +++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Index.cshtml @@ -4,6 +4,12 @@ @{ var userIndex = 0; + + var pageSizes = new List() { 10, 50, 100 }; + var defaultPageSize = WorkContext.CurrentSite.PageSize; + if(!pageSizes.Contains(defaultPageSize)) { + pageSizes.Add(defaultPageSize); + } }

@Html.TitleForPage(T("Manage Users").ToString())

@@ -37,6 +43,13 @@ @Html.SelectOption(Model.Options.Order, UsersOrder.Email, T("Email").ToString()) + +
diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml index 12ef19dc3..1816bdd30 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml @@ -34,10 +34,11 @@ } @if (Model.TotalItemCount > 1) { - @T("Showing items {0} - {1} of {2}", (Model.Page-1)*(int)Model.PageSize + 1, Math.Min(Model.TotalItemCount, (Model.Page)*(int)Model.PageSize), Model.TotalItemCount) + @T("Showing items {0} - {1} of {2}", (Model.Page-1)*(int)Model.PageSize + 1, Model.PageSize == 0 ? Model.TotalItemCount : Math.Min(Model.TotalItemCount, (Model.Page)*(int)Model.PageSize), Model.TotalItemCount) } @if (totalPageCount > 1) { + routeData["pageSize"] = Model.PageSize; @tag.StartElement // first if(firstPage > 1) {