lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Adding pagination to the Contents list admin page.

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-11-01 00:37:23 -07:00
parent 90eb34b568
commit f2300394e9
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
View File

@@ -15,6 +15,7 @@ using Orchard.Data;
using Orchard.DisplayManagement; using Orchard.DisplayManagement;
using Orchard.Localization; using Orchard.Localization;
using Orchard.Logging; using Orchard.Logging;
using Orchard.UI.Navigation;
using Orchard.UI.Notify; using Orchard.UI.Notify;
namespace Orchard.Core.Contents.Controllers { namespace Orchard.Core.Contents.Controllers {
@@ -44,13 +45,10 @@ namespace Orchard.Core.Contents.Controllers {
public Localizer T { get; set; } public Localizer T { get; set; }
public ILogger Logger { get; set; } public ILogger Logger { get; set; }
public ActionResult List(ListContentsViewModel model) { public ActionResult List(ListContentsViewModel model, Pager pager) {
if (model.ContainerId != null && _contentManager.GetLatest((int)model.ContainerId) == null) if (model.ContainerId != null && _contentManager.GetLatest((int)model.ContainerId) == null)
return HttpNotFound(); return HttpNotFound();
const int pageSize = 20;
var skip = (Math.Max(model.Page ?? 0, 1) - 1) * pageSize;
var query = _contentManager.Query(VersionOptions.Latest, GetCreatableTypes().Select(ctd => ctd.Name).ToArray()); var query = _contentManager.Query(VersionOptions.Latest, GetCreatableTypes().Select(ctd => ctd.Name).ToArray());
if (!string.IsNullOrEmpty(model.TypeName)) { if (!string.IsNullOrEmpty(model.TypeName)) {
@@ -104,7 +102,7 @@ namespace Orchard.Core.Contents.Controllers {
//-- instead of this (having the ordering and skip/take after the query) //-- instead of this (having the ordering and skip/take after the query)
contentItems = contentItems.Skip(skip).Take(pageSize).ToList(); var pageOfContentItems = contentItems.Skip(pager.GetStartIndex()).Take(pager.PageSize).ToList();
model.Options.SelectedFilter = model.TypeName; model.Options.SelectedFilter = model.TypeName;
model.Options.FilterOptions = GetCreatableTypes() model.Options.FilterOptions = GetCreatableTypes()
@@ -113,10 +111,14 @@ namespace Orchard.Core.Contents.Controllers {
var list = Shape.List(); var list = Shape.List();
list.AddRange(contentItems.Select(ci => _contentManager.BuildDisplay(ci, "SummaryAdmin"))); list.AddRange(pageOfContentItems.Select(ci => _contentManager.BuildDisplay(ci, "SummaryAdmin")));
var hasNextPage = contentItems.Skip(pager.GetStartIndex(pager.Page + 1)).Any();
var pagerShape = Shape.Pager(pager).HasNextPage(hasNextPage);
var viewModel = Shape.ViewModel() var viewModel = Shape.ViewModel()
.ContentItems(list) .ContentItems(list)
.Pager(pagerShape)
.Options(model.Options) .Options(model.Options)
.TypeDisplayName(model.TypeDisplayName ?? ""); .TypeDisplayName(model.TypeDisplayName ?? "");

2
src/Orchard.Web/Core/Contents/Views/Admin/List.cshtml
View File

@@ -40,6 +40,6 @@
</fieldset> </fieldset>
<fieldset class="contentItems bulk-items"> <fieldset class="contentItems bulk-items">
@Display(Model.ContentItems) @Display(Model.ContentItems)
@Display(Model.ContentItems2)
</fieldset> </fieldset>
@Display(Model.Pager)
} }