From f4fd2d3ba15b93cb56a34be2c439bec60a501577 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Mon, 17 Jan 2011 07:22:49 -0800 Subject: [PATCH] Maintaining filter after postback, and fixing pager text with no results --HG-- branch : dev extra : transplant_source : %9D%83U%F6%AE%DCpT%D1%10%60%E3%5D%3D%89n%C2%60Qa --- .../Modules/Orchard.Users/Controllers/AdminController.cs | 2 +- src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs index a163d8ab3..b304999b7 100644 --- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs @@ -133,7 +133,7 @@ namespace Orchard.Users.Controllers { break; } - return RedirectToAction("Index"); + return Index(viewModel.Options, new PagerParameters()); } public ActionResult Create() { diff --git a/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml b/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml index 85fb7e744..7eac0b219 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml +++ b/src/Orchard.Web/Themes/TheAdmin/Views/Pager.cshtml @@ -26,7 +26,11 @@ Model.Classes.Add("group"); var tag = Tag(Model, "ul"); } -@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) + +@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) +} + @if (totalPageCount > 1) { @tag.StartElement // first